Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 16493)
+++ applications/editors/josm/i18n/po/cs.po	(revision 16827)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-14 18:01+0200\n"
-"PO-Revision-Date: 2009-07-12 13:11+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2009-08-04 11:43+0200\n"
+"PO-Revision-Date: 2009-07-21 15:36+0000\n"
+"Last-Translator: Jezevec <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,81 +16,161 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-07-14 15:27+0000\n"
+"X-Launchpad-Export-Date: 2009-08-04 09:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
+#: ../core/src/org/openstreetmap/gui/jmapviewer/OsmFileCacheTileLoader.java:63
+#, java-format
+msgid ""
+"Failed to access system property ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "Creating main GUI"
 msgstr "Vytváří se grafické rozhraní programu (GUI)"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:202
+#: ../core/src/org/openstreetmap/josm/Main.java:196
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:281
+#: ../core/src/org/openstreetmap/josm/Main.java:289
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
 msgstr "Projekce {0} nemohla být aktivována. Používam Mercator."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:394
+#: ../core/src/org/openstreetmap/josm/Main.java:290
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:60
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:144
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:213
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:224
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:239
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:271
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:281
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:296
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:73
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:82
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:85
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:89
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:340
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:365
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:47
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:67
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:44
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:139
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:736
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:745
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:792
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:799
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:343
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:261
+#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:110
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:604
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:56
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:125
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:307
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:355
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:45
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:153
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:177
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:169
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:358
+msgid "Error"
+msgstr "Chyba"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:399
 msgid "Hint: Some changes came from uploading new data to the server."
 msgstr "Nápověda: některé změny vznikly nahráním nových dat na server."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:395
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:79
+#: ../core/src/org/openstreetmap/josm/Main.java:400
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:279
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:396
+#: ../core/src/org/openstreetmap/josm/Main.java:401
 msgid "There are unsaved changes. Discard the changes and continue?"
 msgstr "Máte neuložené změny. Zahodit změny a pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:397
+#: ../core/src/org/openstreetmap/josm/Main.java:402
 msgid "Save and Exit"
 msgstr "Uložit a ukončit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:397
+#: ../core/src/org/openstreetmap/josm/Main.java:402
 msgid "Discard and Exit"
 msgstr "Neuložit změny a ukončit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:397
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
+#: ../core/src/org/openstreetmap/josm/Main.java:402
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:319
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:363
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:176
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:45
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:32
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:91
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:86
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:82
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
 #: ../plugins/grid/src/grid/GridLayer.java:162
 #: ../plugins/grid/src/grid/GridLayer.java:199
@@ -99,32 +179,92 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:424
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorují se nekorektní URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:437
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:450
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:238
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:253
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:259
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:655
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:720
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1485
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:68
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:232
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:264
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:228
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:249
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:252
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:72
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:145
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:86
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:130
+msgid "Warning"
+msgstr "Varování"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:449
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoruji poškozený soubor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:183
 msgid "UNKNOWN"
 msgstr "NEZNÁMÝ"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
 msgid "About"
 msgstr "O aplikaci"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:122
 msgid "Display the about screen."
 msgstr "Zobrazit obrazovku \"O Aplikaci\""
@@ -132,10 +272,10 @@
 #. TODO: put in a platformHook for system that have no console by default
 #. Add the name of this application
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:131
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:75
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:117
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:166
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:154
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:158
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -143,5 +283,5 @@
 
 #. Add the version number
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:75
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:61
@@ -150,19 +290,19 @@
 msgstr "Verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
 #, java-format
 msgid "Last change at {0}"
 msgstr "Poslední změna v {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
 #, java-format
 msgid "Java Version {0}"
 msgstr "Verze Java: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
 msgid "Homepage"
 msgstr "Domovská stránka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:143
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:145
 msgid "Bug Reports"
 msgstr "Nahlášení chyby"
@@ -172,37 +312,41 @@
 #. <action class="SetWaypointAction" params="Camping"/>
 #. </button>
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27
 #: build/trans_surveyor.java:64
 msgid "Info"
 msgstr "Informace"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
 msgid "Readme"
 msgstr "Readme"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
 msgid "Revision"
 msgstr "Revize"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:151
 msgid "Contribution"
 msgstr "Příspěvek"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:150
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:190
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
+msgid "License"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:222
 msgid "Plugins"
 msgstr "Pluginy"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:157
 msgid "About JOSM..."
 msgstr "O JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:194
 msgid "File could not be found."
 msgstr "Soubor nebyl nalezen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39
 #, java-format
 msgid ""
@@ -214,16 +358,9 @@
 "\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:62
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr "Prosím, vyberte alespoň jeden již nahraný uzel, cestu nebo relaci."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:126
-msgid "Warning"
-msgstr "Varování"
-
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:74
 #, java-format
 msgid ""
@@ -234,7 +371,35 @@
 "primitiv."
 
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
+#, fuzzy
+msgid "Please select the target layer."
+msgstr "Zvolte řádek k vymazání"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#, fuzzy
+msgid "Select target layer"
+msgstr "Vyberte buď:"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:510
+#, fuzzy
+msgid "Merge"
+msgstr "Spojit uzly"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
+#, java-format
+msgid ""
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
+msgid "No target layers"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
 msgid "Add Node..."
 msgstr "Přidat uzel..."
@@ -246,14 +411,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
 #, java-format
@@ -261,57 +428,57 @@
 msgstr "Úpravy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
 msgid "Enter the coordinates for the new node."
 msgstr "Zadejte souřadnice nového uzlu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:43
 msgid "Use decimal degrees."
 msgstr "Použijte desetinné stupně."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:44
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Záporné hodnoty znamenají západní, resp. jižní polokouli."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:47
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
 msgid "Latitude"
 msgstr "Zeměpisná šířka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:50
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
 msgid "Longitude"
 msgstr "Zeměpisná délka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:217
 msgid "Align Nodes in Circle"
 msgstr "Seřadit uzly do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:36
 msgid "Move the selected nodes into a circle."
 msgstr "Přesunout označené uzly do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:48
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -327,25 +494,58 @@
 msgstr "Nástroj: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:137
 msgid "Please select at least four nodes."
 msgstr "Vyberte minimálně 4 uzly"
 
+#. FIXME: not sure whether this fits in a dialog
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:163
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:68
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:84
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:109
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:252
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:63
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:301
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:335
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:95
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:115
+msgid "Information"
+msgstr "Informace"
+
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132
 msgid "Align Nodes in Line"
 msgstr "Seřadit uzly do přímky"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
 msgid "Move the selected nodes in to a line."
 msgstr "Přesunout označené uzly na přímku"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:59
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
 msgid "Please select at least three nodes."
 msgstr "Vyberte minimálně 3 uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53
 #, java-format
 msgid ""
@@ -356,18 +556,10 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109
 msgid "API Capabilities Violation"
 msgstr "Narušení schopností API"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
-msgid "Failed to initialize API. Please try again later."
-msgstr "Selhala inicializace API, prosím zkuste to znovu později."
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
-msgid "API initialization failed"
-msgstr "Selhala inicializace API"
-
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78
 #, java-format
 msgid ""
@@ -377,5 +569,5 @@
 "Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87
 #, java-format
 msgid ""
@@ -386,9 +578,9 @@
 "Délka hodnoty je {3}."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90
 msgid "Precondition Violation"
 msgstr "Selhal předpoklad"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
@@ -396,37 +588,37 @@
 "{0} uzlů v cestě {1} překračuje nejvyšší povolený počet uzlů v cestě {2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "layer"
 msgstr "vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "selection"
 msgstr "výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:28
 msgid "download"
 msgstr "stáhnout"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zvětšit na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zvětšit pohled na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -436,30 +628,30 @@
 msgstr "Zobrazení: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 msgid "Nothing selected to zoom to."
 msgstr "Není zvoleno nic co by se dalo přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 msgid "No conflicts to zoom to"
 msgstr "Není žádný konflikt, na který by se mohlo přiblížit"
 
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
 msgid "Combine Way"
 msgstr "Spojit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:52
 msgid "Combine several ways into one."
 msgstr "Spojit více cest do jedné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:70
 msgid "Please select at least two ways to combine."
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:120
 msgid "Combine ways with different memberships?"
 msgstr "Spojit cesty patřící do jiné relace?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:121
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -467,13 +659,13 @@
 msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 msgid "Combine Anyway"
 msgstr "Přesto zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:152
 msgid "Change directions?"
 msgstr "Změnit směr ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:153
 msgid ""
 "The ways can not be combined in their current directions.  Do you want to "
@@ -483,10 +675,10 @@
 "orientaci?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:144
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
 msgid "Reverse and Combine"
 msgstr "Otočit a zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:207
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:202
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
@@ -494,20 +686,20 @@
 msgstr "Zadej hodnoty pro všechny konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Vyřešit konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:243
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:269
 msgid "All the ways were empty"
 msgstr "Všechny cesty byli prázdné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:299
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -524,23 +716,24 @@
 msgstr "Vybrat označené objekty pro vložení."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
 msgid "Please select something to copy."
 msgstr "Prosím zvol něco ke kopírování"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:278
 msgid "Create Circle"
 msgstr "Vytvořit kruh"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 msgid "Create a circle from three selected nodes."
 msgstr "Vytvořit kruh ze tří uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:201
-msgid "Those nodes are not in a circle."
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:207
+#, fuzzy
+msgid "Those nodes are not in a circle. Aborting."
 msgstr "Tyto uzly nejsou v kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:271
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -549,87 +742,122 @@
 "Prosím, vyberte přesně dva nebo tři body nebo cestu se dvěma či třemi body."
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:64
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:275
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:369
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:638
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:978
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:139
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:102
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:148
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:181
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:234
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:85
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91
 msgid "Delete"
 msgstr "Smazat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:15
 msgid "Delete selected objects."
 msgstr "Smazat označené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:49
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:51
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:99
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:50
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:102
 msgid "File exists. Overwrite?"
 msgstr "Soubor již existuje. Chcete jej přepsat ?"
 
 #. Do it!
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133
 msgid "Distribute Nodes"
 msgstr "Rozdělit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 msgid "Distribute the selected nodes to equal distances along a line."
 msgstr "Rozdělit zvolené uzly ve stejné vzdálenosti podél přímky."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Stáhnout z OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Stáhnout data z OSM serveru"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
 #, java-format
 msgid "File: {0}"
 msgstr "Soubor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45
 msgid "Download"
 msgstr "Stáhnout"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
 msgid "Please select at least one task to download"
 msgstr "Prosím zvol aspoň jeden úkol ke stažení"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+msgid "Download referrers from OSM..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+msgid "Download primitives referring to one of the selected primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
+msgid "Download referrers..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:126
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Došlo k  {0} konfliktům během importu."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:129
+#, fuzzy
+msgid "Conflicts during download"
+msgstr "Chyby při stahování"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
+#, java-format
+msgid "({0}/{1}) Loading parents of primitive {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
 msgid "Duplicate"
 msgstr "Duplikovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:16
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplikovat výběr kopírováním a vložením."
@@ -649,5 +877,5 @@
 msgstr "Ukončit JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:44
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -657,58 +885,73 @@
 "licencované pod GPL."
 
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
 msgid "Export to GPX..."
 msgstr "Exportovat do GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:47
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
 msgid "Export the data to GPX file."
 msgstr "Exportovat data do GPX souboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:67
 msgid "Nothing to export. Get some data first."
 msgstr "Nic nevyexportováno. Nejdříve stáhněte data."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:121
+#, java-format
+msgid "paramenter ''{0}'' must not be null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:119
+#, java-format
+msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:132
 msgid "gps track description"
 msgstr "popis gps trasy"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:138
 msgid "Add author information"
 msgstr "Přidat informace autora"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:141
 msgid "Real name"
 msgstr "Skutečné jméno"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:145
 msgid "E-Mail"
 msgstr "Email"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:149
 msgid "Copyright (URL)"
 msgstr "Copyright (URL)"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:153
 msgid "Predefined"
 msgstr "Předdefinováno"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:155
 msgid "Copyright year"
 msgstr "Copyright"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:170
 msgid "Keywords"
 msgstr "Klíčová slova"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:175
 msgid "Export options"
 msgstr "Nastavení Exportu"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:124
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:177
 msgid "Export and Save"
 msgstr "Exportovat a uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:235
 #, java-format
 msgid ""
@@ -719,25 +962,5 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:123
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:579
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:255
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:862
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:126
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
-msgid "Error"
-msgstr "Chyba"
-
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:295
 msgid "Choose a predefined license"
 msgstr "Zvolte předdefinovanou licenci"
@@ -747,46 +970,49 @@
 msgstr "JOSM Online Nápověda"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:246
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:131
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:134
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:169
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:154
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:210
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:148
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:95
 msgid "Reload"
 msgstr "Znovu načíst"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
 msgid "Can only edit help pages from JOSM Online Help"
 msgstr "Nápovědu můžete upravovat pouze z online nápovědy JOSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:190
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:200
 #, java-format
 msgid "Error while loading page {0}"
 msgstr "Chyba při načítání stránky {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:219
 #, java-format
 msgid "Help page missing. Create it in <A HREF=\"{0}\">english</A>."
 msgstr "Chybí stránka nápovědy. Vytvořte ji v <A HREF=\"{0}\">češtině</A>."
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:224
 #, java-format
 msgid ""
@@ -813,5 +1039,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr ""
+msgstr "Zobrazit informace o OSM bodech, cestách nebo relacích."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
@@ -824,30 +1050,40 @@
 msgstr "Napojit bod na nejbližší část cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:70
 msgid "Join Node and Line"
 msgstr "Spojit uzly a linie"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Beze zkratky"
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#, fuzzy
+msgid "Merge layer"
+msgstr "Přesto sloučit"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:18
+#, fuzzy
+msgid "Merge the current layer into another layer"
+msgstr "Spojit vrstvy pod označenou"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:57
 msgid "Merge Nodes"
 msgstr "Spojit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
 msgid "Merge nodes into the oldest one."
 msgstr "Spoj uzly do nejstaršího"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:77
 msgid "Please select at least two nodes to merge."
 msgstr "Zvolte minimálně dva uzly ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:148
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:158
 msgid "Merge nodes with different memberships?"
 msgstr "Spojit uzly s různými členství v relaci?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -856,68 +1092,79 @@
 "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 msgid "Merge Anyway"
 msgstr "Přesto sloučit"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:253
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:271
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:295
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Spojit {0} uzly"
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
+#, fuzzy
+msgid "Merge selection"
+msgstr "výběr"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+#, fuzzy
+msgid "Merge the currently selected primitives into another layer"
+msgstr "Aktualizovat právě vybrané prvky ze serveru"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:76
 msgid "Mirror"
 msgstr "Zrcadlit"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 msgid "Mirror selected nodes and ways."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
+msgstr "Zrcadlit vybrané body a cesty."
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
 msgid "Please select at least one node or way."
 msgstr "Zvolte minimálně jeden uzel nebo cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
 msgid "up"
 msgstr "nahoru"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
 #, java-format
 msgid "Move objects {0}"
 msgstr "Přesunout objekty {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
 msgid "down"
 msgstr "dolů"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
 msgid "left"
 msgstr "vlevo"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
 msgid "right"
 msgstr "vpravo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Move {0}"
 msgstr "Přesunout {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Přesunutí objektů {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:105
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
 msgid "Cannot move objects outside of the world."
 msgstr "Nemohu přesouvat objekty mimo svět."
@@ -925,5 +1172,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "New"
 msgstr "Nový"
@@ -933,26 +1180,17 @@
 msgstr "Vytvořit novou mapu"
 
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:22
-msgid "unnamed"
-msgstr "nepojmenováno"
-
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32
 msgid "Open..."
 msgstr "Otevřít..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
 msgid "Open a file."
 msgstr "Otevřít soubor."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54
-#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
-#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
-#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
-#, java-format
-msgid "Could not read \"{0}\""
-msgstr "Nemůžu číst \"{0}\""
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59
+#, java-format
+msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -981,34 +1219,35 @@
 msgstr "URL ke stažení"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
 msgid "Orthogonalize Shape"
 msgstr "Ortogonalizovat tvar"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:42
 msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62
 msgid "Only two nodes allowed"
 msgstr "Povoleny pouze dva uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
 msgid "Selection must consist only of ways."
 msgstr "Výběr se musí skládat pouze z cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:87
 msgid "Please select one or more closed ways of at least four nodes."
 msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:109
 msgid "Please select ways with almost right angles to orthogonalize."
 msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci."
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:119
+#, fuzzy
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
 "undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?"
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
 "<html>Pužíváte EPSG:4326 projekci, což může vást<br>k nechtěným výsledkům "
@@ -1016,9 +1255,9 @@
 "varování.<br>Chcete pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
 msgid "Only one node selected"
 msgstr "Vybrán pouze jeden uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283
 msgid "Orthogonalize"
 msgstr "Ortogonalizovat"
@@ -1034,11 +1273,11 @@
 msgstr "Vložit ze schránky"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:27
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:78
 msgid "Paste Tags"
 msgstr "Vložit Popisky"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
 msgid "Apply tags of contents of paste buffer to all selected items."
 msgstr "Použít popisky objektu ve schránce na všechny zvolené objekty."
@@ -1066,16 +1305,21 @@
 msgstr "Vrátit zpět poslední vrácenou akci"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
 msgid "Rename layer"
 msgstr "Přejmenovat vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
 msgid "Also rename the file"
 msgstr "Také přejmenovat soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:87
-#, java-format
-msgid "Could not rename the file \"{0}\"."
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:70
+#, java-format
+msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:99
+#, fuzzy, java-format
+msgid "Could not rename file ''{0}''"
 msgstr "Nemohu přejmenovat soubor \"{0}."
 
@@ -1089,9 +1333,9 @@
 msgstr "Otočit směr všech zvolených cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 msgid "Please select at least one way."
 msgstr "Zvolte minimálně jednu cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80
 msgid "Reverse ways"
 msgstr "Otočit cesty"
@@ -1099,17 +1343,19 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:183
 msgid "Save"
 msgstr "Uložit"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182
 msgid "Save the current data."
 msgstr "Uložit aktuální data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:38
 #, java-format
 msgid "File {0} exists. Overwrite?"
 msgstr "Soubor {0} již existuje. Přepsat ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:84
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:91
 msgid ""
 "Internal Error: cannot check conditions for no layer. Please report this as "
@@ -1118,25 +1364,25 @@
 "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:88
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
 msgid "No document open so nothing to save."
 msgstr "Není otevřený žádný dokument, není co uložit."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
 msgid "Empty document"
 msgstr "Prázdný dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
 msgid "The document contains no data."
 msgstr "Dokument neobsahuje žádná data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:92
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:107
 msgid "Save anyway"
 msgstr "Přesto uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:100
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1146,54 +1392,75 @@
 "vyřešeny, jako by byly všechny odmítnuty. Pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
 msgid "Reject Conflicts and Save"
 msgstr "Zamítnout konflikty a uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
 msgid "Save OSM file"
 msgstr "Uložit OSM soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:130
 msgid "Save GPX file"
 msgstr "Uložit GPX soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
 msgid "Save Layer"
 msgstr "Ulož vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
-msgid "Could not back up file."
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:143
+#, fuzzy, java-format
+msgid "Could not back up file. Exception is: {0}"
 msgstr "Nemohu zálohovat soubor."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:190
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:233
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:212
+#, fuzzy, java-format
+msgid "Unknown file extension for file ''{0}''"
+msgstr "Neznámá koncovka souboru: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:223
+#, fuzzy, java-format
+msgid "<html>An error occurred while saving. <br>Error is: <br>{0}</html>"
+msgstr "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
+#, fuzzy, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br> Error is: <br>{0}</"
+"html>"
+msgstr "Během obnovení zálohy došlo k chybě."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:270
 msgid "Unknown file extension."
 msgstr "Neznámá přípona souboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:196
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:238
-msgid "An error occurred while saving."
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:280
+#, fuzzy, java-format
+msgid "An error occurred while saving. Error is: {0}"
 msgstr "Během ukládání došlo k chybě."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:248
-msgid "An error occurred while restoring backup file."
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:295
+#, fuzzy, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
 msgstr "Během obnovení zálohy došlo k chybě."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:199
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198
 msgid "Save the current data to a new file."
 msgstr "Uložit aktuální data do nového souboru"
 
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:14
 msgid ""
 "Select all undeleted objects in the data layer. This selects incomplete "
@@ -1228,16 +1495,16 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:116
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:207
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:120
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:203
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
 msgid "Close"
 msgstr "Zavřít"
 
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:55
 msgid "Split Way"
 msgstr "Rozdělit cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
 msgid "Split a way at the selected node."
 msgstr "Rozdělit cestu zvoleným uzlem"
@@ -1247,5 +1514,5 @@
 msgstr "Tento výběr nemůže být použit k rozdělení."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
 msgid "The selected node is not in the middle of any way."
 msgid_plural "The selected nodes are not in the middle of any way."
@@ -1254,5 +1521,5 @@
 msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1265,9 +1532,9 @@
 msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
 msgid "The selected nodes do not share the same way."
 msgstr "Zvolené uzly nesdílejí stejnou cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:166
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1276,10 +1543,10 @@
 msgstr[2] "Označené cesty neobsahují vybrané uzly."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
 msgid "You must select two or more nodes to split a circular way."
 msgstr "Musíte zvolit dva nebo více uzlů pro rozdělění kruhové cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:232
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1289,8 +1556,9 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:350
+#, fuzzy
 msgid ""
-"A role based relation membership was copied to all new ways.\n"
-"You should verify this and correct it when necessary."
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
 msgstr ""
 "Příslušnost k relaci byla zkopírována na všechny nově vzniklé cesty.\n"
@@ -1298,11 +1566,14 @@
 "měly být opraveny."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:356
+#, fuzzy
 msgid ""
-"A relation membership was copied to all new ways.\n"
-"You should verify this and correct it when necessary."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"Členství v relacích bylo zkopírováno na všechny nové cesty.\n"
+"Měl by jste výsledek zkontrolovat a  pokud je třeba opravit."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:362
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1323,47 +1594,47 @@
 msgstr "Zapnout/Vypnout globální nastavení ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
 msgid "UnGlue Ways"
 msgstr "Rozpojit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 msgid "Duplicate nodes that are used by multiple ways."
 msgstr "Zduplikovat uzly používané více cestami."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:83
 msgid "This node is not glued to anything else."
 msgstr "Tento uzel není přilepen k ničemu jinému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:108
 msgid "None of these nodes are glued to anything else."
 msgstr "Žádný z těchto uzlů není připojen na něco jiného."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Žádný z uzlů v této cestě není připojen na něco jiného."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tento výběr nelze použít pro oddělení uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid "* One tagged node, or"
 msgstr "* Jeden otagovaný uzel, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
 msgid "* One node that is used by more than one way, or"
 msgstr "* Jeden uzel používaný více než jednou cestou, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid "* One node that is used by more than one way and one of those ways, or"
 msgstr ""
 "* Jeden uzel používaný více než jednou cestou a jednu z těchto cest, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1372,5 +1643,5 @@
 "nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1379,5 +1650,5 @@
 "cestě."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1390,9 +1661,9 @@
 "své vlastní kopie a všechny uzly budou vybrány."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171
 msgid "Unglued Node"
 msgstr "Nespojený uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:370
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1400,5 +1671,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1414,141 +1685,91 @@
 msgstr "Vrátit poslední akci."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:37
 msgid "Unselect All"
 msgstr "Odznačit vše"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect all objects."
 msgstr "Odznačit všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:24
 msgid "Unselect All (Focus)"
 msgstr "Odznačit vše (Fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:35
 msgid "Unselect All (Escape)"
 msgstr "Odznačit vše (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
 msgid "Update Data"
 msgstr "Aktualizovat data"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:21
 msgid "Updates the current data layer from the server (re-downloads data)"
 msgstr "Aktualizuje data v aktuální vrstvě ze serveru (znovu stáhne data)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:64
-msgid ""
-"No data to update found. Have you already opened or downloaded a data layer?"
-msgstr ""
-"Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou "
-"vrstvu?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:65
-msgid "No data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:61
-msgid "Failed to update the selected primitives."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:62
-msgid "Update failed"
-msgstr "Aktualizace selhala"
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:76
-#, java-format
-msgid "Could not find primitive with id {0} in the current dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
-msgid "Missing primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:185
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:189
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
+#, fuzzy
+msgid "No current dataset found"
+msgstr "Nenalezena vrstva s GPX daty."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+#, fuzzy
+msgid "Didn't find a primitive with id {0} in the current dataset"
+msgstr "V aktuální datové sadě nemohu nalézt primitiva s id {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
 msgid "Update Selection"
 msgstr "Aktualizovat výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
 msgid "Updates the currently selected primitives from the server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
+msgstr "Aktualizovat právě vybrané prvky ze serveru"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "There are no selected primitives to update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:204
+msgstr "Nejsou vybrány žádné prvky pro aktualizaci."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
 msgid "Selection empty"
 msgstr "Prázdný výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
 msgid "Upload to OSM..."
 msgstr "Nahrát do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Upload all changes to the OSM server."
 msgstr "Nahrát všechy změny na OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:100
-msgid "Objects to add:"
-msgstr "Objekty k přidání:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
-msgid "Objects to modify:"
-msgstr "Objekty ke změnění:"
-
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:116
-msgid "Objects to delete:"
-msgstr "Objekty ke smazání:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:123
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Napište stručný komentář ke změnám, které nahráváte na server:"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:132
-msgid "Upload these changes?"
-msgstr "Nahrát tyto úpravy?"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:134
-msgid "Upload Changes"
-msgstr "Nahrát změny na server"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
 msgid "Nothing to upload. Get some data first."
 msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:164
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:127
 msgid "There are unresolved conflicts. You have to resolve these first."
 msgstr "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
 msgid "No changes to upload."
 msgstr "Žádné změny k nahrání."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
-msgid "Uploading"
-msgstr "Nahrávám"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:261
-msgid "Updating primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
 #, java-format
 msgid "Synchronize {0} {1} only"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:318
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:362
+msgstr "Synchronizovat pouze {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovat celý dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:322
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215
 #, java-format
 msgid ""
@@ -1561,18 +1782,25 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:337
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:377
+"<html>Aktualizace <strong>selhala</strong>, protože na serveru je novější "
+"verze jednoho z vašich<br> bodů, cest nebo relací.<br>Konflikt je způsoben "
+"<strong>{0}</strong> s id <strong>{1}</strong>,<br>na serveru je verze {2}, "
+"vaše verze je {3}.<br><br>Klikněte <strong>{4}</strong> pro synchronizaci "
+"konfliktního prvku.<br>Klikněte <strong>{5}</strong> pro synchronizaci "
+"kompletní lokální datové sady se serverem.<br>Klikněte <strong>{6}</strong> "
+"pro přerušení a pokračování editace.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 msgid "Conflict detected"
 msgstr "Detekován konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:351
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:390
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Neočekávaná návratová hodnota. Navráceno {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:366
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:258
 #, java-format
 msgid ""
@@ -1582,57 +1810,71 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:406
+"<html>Aktualizace <strong>selhala</strong>, protože na serveru je novější "
+"verze jednoho z vašich<br> bodů, cest nebo relací.<br><br>Klikněte <strong>"
+"{0}</strong> pro synchronizaci kompletní lokální datové sady se serverem."
+"<br>Klikněte <strong>{1}</strong> pro přerušení a pokračování editace.<br></"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
-#, java-format
-msgid ""
-"<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
-msgid "Precondition violation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:459
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because a primitive you tried "
-"to<br>delete on the server is already deleted.<br><br>The error message is:"
-"<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:470
-msgid "Primitive already deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:491
+msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:536
+msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:545
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:562
+msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389
 msgid "Upload to OSM API failed"
 msgstr "Nahrándí do OSM API selhalo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:575
-#, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411
+msgid "Updating primitive"
+msgstr "Aktualizuji prvky"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
+#, fuzzy
+msgid "upload all changes in one request"
+msgstr "Nahrát všechy změny na OSM server."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
 msgid ""
-"Failed to initialize communication with the OSM server {0}.\n"
-"Check the server URL in your preferences and your internet connection."
-msgstr ""
-"Selhalo navázání komunikace s OSM serverem {0}.\n"
-"Zkontrolujte URL serveru v nastavení a vaše připojení k internetu."
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
+msgid "Objects to add:"
+msgstr "Objekty k přidání:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472
+msgid "Objects to modify:"
+msgstr "Objekty ke změnění:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480
+msgid "Objects to delete:"
+msgstr "Objekty ke smazání:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:487
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Napište stručný komentář ke změnám, které nahráváte na server:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:499
+msgid "Upload these changes?"
+msgstr "Nahrát tyto úpravy?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:501
+msgid "Upload Changes"
+msgstr "Nahrát změny na server"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:531
+msgid "Uploading"
+msgstr "Nahrávám"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -1720,42 +1962,54 @@
 msgstr "Zpomalené přehrávání"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:31
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:32
 msgid "Downloading GPS data"
 msgstr "Stahuji GPS data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:47
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:45
 msgid "Downloaded GPX Data"
 msgstr "Stažená GPX data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:78
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:73
 msgid "Raw GPS data"
 msgstr "Surová GPS data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:45
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:54
 msgid "Downloading data"
 msgstr "Stahuji data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:63
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:64
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
 msgid "No data imported."
 msgstr "Nic nebylo importováno"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:87
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:53
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
 msgstr "Stahuji {0} z {1} ({2} zbývá)"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:93
-msgid "The following errors occurred during mass download:"
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:78
+#, fuzzy
+msgid "Updating data"
+msgstr "Nahrávám data"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
+#, fuzzy, java-format
+msgid "The following errors occurred during mass download:{0}"
 msgstr "Následující chbya nastala během hromadného stahování:"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
 msgid "Errors during Download"
 msgstr "Chyby při stahování"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:146
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
 #, java-format
 msgid ""
@@ -1766,22 +2020,27 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:162
+"<html>Ve vaší lokální datové sadě je {0} prvků, které<br>mohou být na "
+"serveru smazány. Pokud se pokusíte pozdějí o jejich smazání "
+"nebo<br>aktualizaci, server bude pravděpodobně reportovat<br>konflikt."
+"<br><br>Klikněte <strong>{1}</strong> pro zjištění stavu těchto prvků<br>na "
+"serveru.<br>Klikněte <strong>{2}</strong> pro ignorování.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:189
 msgid "Deleted or moved primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
+msgstr "Smazané nebo přesunuté prvky"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
 msgid "Delete Mode"
 msgstr "Režim mazání"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49
 msgid "Delete nodes or ways."
 msgstr "Smaž body nebo cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
 #, java-format
@@ -1789,5 +2048,5 @@
 msgstr "Režim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:135
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -1797,761 +2056,23 @@
 "když mažete trasu. CTRL: smazat referenční objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
-msgid "Draw"
-msgstr "Kreslit"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:90
-msgid "Draw nodes"
-msgstr "Kreslit uzly"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
-msgid "Mode: Draw Focus"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:206
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
-msgid "selected"
-msgstr "vybráno"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:336
-msgid "Cannot add a node outside of the world."
-msgstr "Nemůžu přidat uzel ležící mimo Zemi."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:493
-msgid "Add node"
-msgstr "Přidat uzel"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:495
-msgid "Add node into way"
-msgstr "Přidat uzel do cesty"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:500
-msgid "Connect existing way to node"
-msgstr "Spojit existující cestu do uzlu"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:502
-msgid "Add a new node to an existing way"
-msgstr "Přidat nový uzel do již existující cesty"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:504
-msgid "Add node into way and connect"
-msgstr "Přidat uzel do cesty a spojit"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:881
-msgid "Create new node."
-msgstr "Vytvořit nový uzel."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:886
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:908
-msgid "Select node under cursor."
-msgstr "Vybrat uzel pod kurzorem."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:888
-#, java-format
-msgid "Insert new node into way."
-msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Vložit nový uzel do cesty"
-msgstr[1] "Vložit nový uzel do {0} cest."
-msgstr[2] "Vložit nový uzel do {0} cest."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:897
-msgid "Start new way from last node."
-msgstr "Začít novou cestu od posledního uzlu."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:899
-msgid "Continue way from last node."
-msgstr "Pokračovat v cestě od posledního uzlu."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:910
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:920
-msgid "Finish drawing."
-msgstr "Dokončit kreslení"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-msgid "Extrude"
-msgstr "Vytlačit"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
-msgid "Create areas"
-msgstr "Vytvořit plochy"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:248
-msgid "Extrude Way"
-msgstr "Vytáhnout cestu"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:261
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:520
-msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Pusť myší tlačítko k vybrání obejktů v obdélníku"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:263
-msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr "Nakresli obdélník požadované velikosti a pak pusť myší tlačítko."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:265
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:524
-msgid "Release the mouse button to stop rotating."
-msgstr "Pusť myší tlačítko k zastavení otaáčení"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:267
-msgid "Drag a way segment to make a rectangle."
-msgstr "Táhni segmentem cesty a vytvoř obdelník."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
-msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:98
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
-msgid "Select"
-msgstr "Vybrat"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:97
-msgid "Select, move and rotate objects"
-msgstr "Zvol, posuň a otáčej objekty"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:198
-#, java-format
-msgid "Add and move a virtual new node to way"
-msgid_plural "Add and move a virtual new node to {0} ways"
-msgstr[0] "Přidat a posunout virtuální nový uzel do cesty"
-msgstr[1] "Přidat a posunout virtuální nový uzel do {0} cest"
-msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:447
-msgid "Move elements"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:448
-#, java-format
-msgid ""
-"You did move more than {0} elements. Moving a large number of elements is "
-"often an error.\n"
-"Really move them?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
-msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:451
-msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:522
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:526
-msgid ""
-"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
-"Ctrl to rotate selected; or change selection"
-msgstr ""
-"Objekty se přemísťují přetažením; Shift pro přidání do výběru (Ctrl pro "
-"přidání/odebrání); Shift-Ctrl pro otáčení výběrem"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:49
-msgid "Zoom"
-msgstr "Zvětšení"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
-msgid "Zoom and move map"
-msgstr "Přiblížení a pohyb mapy"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
-msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
-"move zoom with right button"
-msgstr ""
-"Přibližování pomocí tažení nebo CTRL+. nebo CTRL+,; pohyb s CTRL+šipka "
-"nahoru dolu doleva doprava; pohyb se zoomem možno též pravým tlačítkem myši"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:45
-msgid "Search..."
-msgstr "Hledat..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
-msgid "Search for objects."
-msgstr "Hledat objekty."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:66
-msgid "No data loaded."
-msgstr "Nebyla načtena žádná data."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:57
-msgid "Please enter a search string."
-msgstr "Zadjte hledaný řetězec."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:61
-msgid "replace selection"
-msgstr "nahradit označené"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:62
-msgid "add to selection"
-msgstr "přidat k výběru"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:63
-msgid "remove from selection"
-msgstr "odebrat z výběru"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
-msgid "case sensitive"
-msgstr "velikost písmen rozhoduje"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
-msgid "regular expression"
-msgstr "regulární výraz"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
-msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
-msgstr ""
-"<b>Baker Street</b> - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:85
-msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
-msgstr ""
-"<b>\"Baker Street\"</b> - 'Baker Street' v jakémkoliv klíči nebo jménu."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:86
-msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
-msgstr "<b>name:Bak</b> - 'Bak' kdekoliv ve jménu."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:87
-msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:88
-msgid ""
-"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
-"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:89
-msgid "<b>-name:Bak</b> - not 'Bak' in the name."
-msgstr "<b>-name:Bak</b> - neobsahuje 'Bak' ve jménu."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:90
-msgid "<b>foot:</b> - key=foot set to any value."
-msgstr "<b>foot:</b> - klíč 'foot' nastavený na jakoukoliv hodnotu."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:91
-msgid "<u>Special targets:</u>"
-msgstr "<u>Speciální cíle:</u>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr "<b>type:</b> - typ objektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
-msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - všechny objekty změněné uživatelem"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
-msgid "<b>id:</b>... - object with given ID"
-msgstr "<b>id:</b>... - objekt s daným ID"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
-msgid "<b>nodes:</b>... - object with given number of nodes"
-msgstr "<b>nodes:</b>... - objekt s daným počtem uzlů"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
-msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - všechny změněné objekty"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
-msgid "<b>selected</b> - all selected objects"
-msgstr "<b>selected</b> - všechny vybrané objekty"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
-msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - všechny nekompletní objekty"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
-msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>untagged</b> - všechny objekty bez tagů"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>výraz</i></b> - všechny podobjekty objektů odpovídajících výrazu"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>výraz</i></b> - všechny rodiče objektů odpovídajících výrazu"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
-msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
-msgstr "Použijte <b>|</b> nebo <b>OR</b> ke kombinaci s logickým \"nebo\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
-msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
-msgstr ""
-"Použijte <b>\"</b> jako uvozovky (například pokud klíč obsahuje dvojtečku)"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
-msgid "Use <b>(</b> and <b>)</b> to group expressions"
-msgstr "Použijte <b>(</b> a <b>)</b> k seskupení výrazů"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:141
-msgid "Search"
-msgstr "Hledat"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
-msgid "Start Search"
-msgstr "Začít hledání"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
-#, java-format
-msgid "No match found for ''{0}''"
-msgstr "Nebyly nalezeny záznamy pro \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
-#, java-format
-msgid "Nothing added to selection by searching for ''{0}''"
-msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
-#, java-format
-msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
-#, java-format
-msgid "Found {0} matches"
-msgstr "Nalezeno {0} odpovídajích výrazů"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
-msgid "CS"
-msgstr "CS"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:209
-msgid "CI"
-msgstr "CI"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
-msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
-#, java-format
-msgid ""
-"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
-"\n"
-"{2}"
-msgstr ""
-"Regulární výraz \"{0}\" má chybu na pozici {1}, celá chyba:\n"
-"\n"
-"{2}"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:172
-msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
-#, java-format
-msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:359
-#, java-format
-msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:497
-#, java-format
-msgid "Unexpected token: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:518
-msgid "Missing arguments for or."
-msgstr "Chybějící argument pro \"NEBO\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:529
-msgid "Missing argument for not."
-msgstr "Chybějící argument pro \"NOT\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:540
-msgid "Expected closing parenthesis."
-msgstr "Očekávám uzavírací závorku."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:596
-msgid "Wrong number of parameters for nodes operator."
-msgstr "Chybný počet parametrů pro operátor nodes."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:599
-#, java-format
-msgid ""
-"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
-"nodes or range, for example nodes:10-20"
-msgstr ""
-"Neplatná hodnota pro operátor nodes: {0}. Je očekáváno číslo, nebo rozsah "
-"čísel, například nodes:10-20."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:606
-#, java-format
-msgid "Incorrect value of id operator: {0}. Number is expected."
-msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:34
-msgid "Load Selection"
-msgstr "Nahrát výběr"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:41
-#, java-format
-msgid "Contact {0}..."
-msgstr "Kontakt {0}..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
-msgid "Downloading..."
-msgstr "Stahuji..."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:59
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:67
-#, java-format
-msgid "Could not read from URL: \"{0}\""
-msgstr "Nemohu číst z URL:\"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:62
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:70
-#, java-format
-msgid "Parsing error in URL: \"{0}\""
-msgstr "Chyba parsování v URL:\"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
-msgid "Error while communicating with server."
-msgstr "Chyba při komunikaci se serverem."
-
-#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:57
-#, java-format
-msgid "Add {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:46
-#, java-format
-msgid "Change {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:99
-#, java-format
-msgid "Remove \"{0}\" for {1} ''{2}''"
-msgstr "Odstraněno \"{0}\" pro {1} ''{2}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:100
-#, java-format
-msgid "Set {0}={1} for {2} ''{3}''"
-msgstr "Nastaveno {0}={1} pro {2} ''{3}''"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:95
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
-msgid "object"
-msgid_plural "objects"
-msgstr[0] "objekt"
-msgstr[1] "objekty"
-msgstr[2] "objekty"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:105
-#, java-format
-msgid "Remove \"{0}\" for {1} {2}"
-msgstr "Odstraněno \"{0}\" pro {1} {2}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:106
-#, java-format
-msgid "Set {0}={1} for {2} {3}"
-msgstr "Nastaveno {0}={1} pro {2} {3}"
-
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:68
-#, java-format
-msgid "Change relation member role for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:250
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
-msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
-#, java-format
-msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
-
-#. should not happen
-#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
-msgid "cannot resolve undecided conflict"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:82
-#, java-format
-msgid "Delete {1} {0}"
-msgstr "Smazat {1} {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:98
-#, java-format
-msgid "Delete {0} {1}"
-msgstr "Smazat {0} {1}"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:147
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:154
-msgid "Conflicting relation"
-msgstr "Konfliktní relace"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:148
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
-"Delete from relation?"
-msgstr ""
-"Výběr \"{0}\" je používán v relaci \"{1}\" s rolí {2}.\n"
-"Smazat z relace?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:150
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:585
-msgid "Delete from relation"
-msgstr "Odstranit z relace"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:155
-#, java-format
-msgid ""
-"Selection \"{0}\" is used by relation \"{1}\".\n"
-"Delete from relation?"
-msgstr ""
-"Výběr \"{0}\" je používán v relaci \"{1}\".\n"
-"Smazat z relace?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:359
-msgid "Split way segment"
-msgstr "Rozdělit segment cesty"
-
-#. leave message in one tr() as there is a grammatical connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:378
-msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you don't see) might "
-"use them.<br>Do you really want to delete?"
-msgstr ""
-"Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
-"problémy, protože jiné objekty (které nevidíte) je mohou používat."
-"<br>Opravdu je chcete smazat?"
-
-#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
-#, java-format
-msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-msgid "Move"
-msgstr "Přesunout"
-
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
-msgid "node"
-msgid_plural "nodes"
-msgstr[0] "uzel"
-msgstr[1] "uzly"
-msgstr[2] "uzly"
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
-msgid "Purging 1 primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
-#, java-format
-msgid "removing reference from way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
-#, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
-#, java-format
-msgid "removing reference from relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
-#, java-format
-msgid "Resolve conflicts in member list of relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
-#, java-format
-msgid "Remove relation member {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
-#, java-format
-msgid "Rotate {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
-msgid "Sequence"
-msgstr "Sekvence"
-
-#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
-#, java-format
-msgid "Resolve {0} tag conflicts in {1} {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
-#, java-format
-msgid "Undelete {0} primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
-#, java-format
-msgid "Resolve version conflicts for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
-#, java-format
-msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
-#, java-format
-msgid "Main dataset does not include node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
-msgid "Apply?"
-msgstr "Použít ?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Byl změněn směr cesty. Mají se provést zásledující změny vlastností cesty a "
-"jejích bodů, z důvodů udržení konzistence dat?"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
-msgid "Relation"
-msgstr "Vztah"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
-msgid "Old role"
-msgstr "Stará role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:32
-msgid "New role"
-msgstr "Nová role"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
-msgid "Old key"
-msgstr "Starý klíč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
-msgid "Old value"
-msgstr "Stará hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
-msgid "New key"
-msgstr "Nový klíč"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-msgid "New value"
-msgstr "Nová hodnota"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:40
-msgid "Apply selected changes"
-msgstr "Použít zvolené změny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
-msgid "Don't apply changes"
-msgstr "Neprovádět změny"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:83
-msgid "Please select which property changes you want to apply."
-msgstr "Prosím vyberte které změny vlastností chcete použít."
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:96
-msgid "Properties of "
-msgstr "Vlastnosti "
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:120
-msgid "Roles in relations referring to"
-msgstr "Role v relaci odkazující na"
-
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:136
-msgid "Automatic tag correction"
-msgstr "Automatická korekce popisků"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:314
-#, java-format
-msgid "Malformed config file at lines {0}"
-msgstr "Poškozený konfigurační soubor na řádku {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:324
-#, java-format
-msgid "Cannot open preferences directory: {0}"
-msgstr "Nelze otevřít adresář s nastavením: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
-#, java-format
-msgid "Preferences file had errors. Making backup of old one to {0}."
-msgstr "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}."
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:79
-#, java-format
-msgid "Preferences stored on {0}"
-msgstr "Předvolby uloženy na {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:82
-#, java-format
-msgid "Could not upload preferences. Reason: {0}"
-msgstr "Nemohu nahrát předvolby. Důvod: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:93
-msgid "Could not load preferences from server."
-msgstr "Nemohu nahrát předvolby ze serveru."
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:71
-#, java-format
-msgid "already registered a conflict for primitive ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:160
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
 #: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:313
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:456
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:32
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:141
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:153
@@ -2563,7 +2084,803 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:342
 #, java-format
 msgid "parameter ''{0}'' must not be null"
+msgstr "parameter ''{0}'' nesmí být null"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100
+msgid "Draw"
+msgstr "Kreslit"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+msgid "Draw nodes"
+msgstr "Kreslit uzly"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100
+msgid "Mode: Draw Focus"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
+msgid "selected"
+msgstr "vybráno"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+msgid "Cannot add a node outside of the world."
+msgstr "Nemůžu přidat uzel ležící mimo Zemi."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:528
+msgid "Add node"
+msgstr "Přidat uzel"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
+msgid "Add node into way"
+msgstr "Přidat uzel do cesty"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:538
+msgid "Connect existing way to node"
+msgstr "Spojit existující cestu do uzlu"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
+msgid "Add a new node to an existing way"
+msgstr "Přidat nový uzel do již existující cesty"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
+msgid "Add node into way and connect"
+msgstr "Přidat uzel do cesty a spojit"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:928
+msgid "Create new node."
+msgstr "Vytvořit nový uzel."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:933
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+msgid "Select node under cursor."
+msgstr "Vybrat uzel pod kurzorem."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "Vložit nový uzel do cesty"
+msgstr[1] "Vložit nový uzel do {0} cest."
+msgstr[2] "Vložit nový uzel do {0} cest."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+msgid "Start new way from last node."
+msgstr "Začít novou cestu od posledního uzlu."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+msgid "Continue way from last node."
+msgstr "Pokračovat v cestě od posledního uzlu."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:970
+msgid "Finish drawing."
+msgstr "Dokončit kreslení"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
+msgid "Extrude"
+msgstr "Vytlačit"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:77
+msgid "Create areas"
+msgstr "Vytvořit plochy"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:251
+msgid "Extrude Way"
+msgstr "Vytáhnout cestu"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:538
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Pusť myší tlačítko k vybrání obejktů v obdélníku"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
+msgid "Draw a rectangle of the desired size, then release the mouse button."
+msgstr "Nakresli obdélník požadované velikosti a pak pusť myší tlačítko."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+msgid "Release the mouse button to stop rotating."
+msgstr "Pusť myší tlačítko k zastavení otaáčení"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270
+msgid "Drag a way segment to make a rectangle."
+msgstr "Táhni segmentem cesty a vytvoř obdelník."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+msgid ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
+msgid "Select"
+msgstr "Vybrat"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+msgid "Select, move and rotate objects"
+msgstr "Zvol, posuň a otáčej objekty"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#, java-format
+msgid "Add and move a virtual new node to way"
+msgid_plural "Add and move a virtual new node to {0} ways"
+msgstr[0] "Přidat a posunout virtuální nový uzel do cesty"
+msgstr[1] "Přidat a posunout virtuální nový uzel do {0} cest"
+msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:465
+msgid "Move elements"
+msgstr "Přesun prvků"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:466
+#, java-format
+msgid ""
+"You did move more than {0} elements. Moving a large number of elements is "
+"often an error.\n"
+"Really move them?"
+msgstr ""
+"Přesunul jste více než {0} prvků. Přesun velkého množství prvků je často "
+"chybou.\n"
+"Opravdu je chcete přesunout?"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+msgid "Move them"
+msgstr "Přesunout je"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+msgid "Undo move"
+msgstr "Vrátit zpět přesun"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:540
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+msgid ""
+"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
+"Ctrl to rotate selected; or change selection"
+msgstr ""
+"Objekty se přemísťují přetažením; Shift pro přidání do výběru (Ctrl pro "
+"přidání/odebrání); Shift-Ctrl pro otáčení výběrem"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
+msgid "Zoom"
+msgstr "Zvětšení"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+msgid "Zoom and move map"
+msgstr "Přiblížení a pohyb mapy"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:74
+msgid ""
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
+"move zoom with right button"
+msgstr ""
+"Přibližování pomocí tažení nebo CTRL+. nebo CTRL+,; pohyb s CTRL+šipka "
+"nahoru dolu doleva doprava; pohyb se zoomem možno též pravým tlačítkem myši"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46
+msgid "Search..."
+msgstr "Hledat..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+msgid "Search for objects."
+msgstr "Hledat objekty."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
+msgid "Can't search because there is no loaded data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
+msgid "Please enter a search string."
+msgstr "Zadjte hledaný řetězec."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+msgid "replace selection"
+msgstr "nahradit označené"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+msgid "add to selection"
+msgstr "přidat k výběru"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
+msgid "remove from selection"
+msgstr "odebrat z výběru"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+msgid "case sensitive"
+msgstr "velikost písmen rozhoduje"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
+msgid "regular expression"
+msgstr "regulární výraz"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
+msgstr ""
+"<b>Baker Street</b> - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
+msgstr ""
+"<b>\"Baker Street\"</b> - 'Baker Street' v jakémkoliv klíči nebo jménu."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
+msgstr "<b>name:Bak</b> - 'Bak' kdekoliv ve jménu."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+msgid ""
+"<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+msgid "<b>-name:Bak</b> - not 'Bak' in the name."
+msgstr "<b>-name:Bak</b> - neobsahuje 'Bak' ve jménu."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr "<b>foot:</b> - klíč 'foot' nastavený na jakoukoliv hodnotu."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+msgid "<u>Special targets:</u>"
+msgstr "<u>Speciální cíle:</u>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr "<b>type:</b> - typ objektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+msgid "<b>user:</b>... - all objects changed by user"
+msgstr "<b>user:</b>... - všechny objekty změněné uživatelem"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+msgid "<b>id:</b>... - object with given ID"
+msgstr "<b>id:</b>... - objekt s daným ID"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+msgid "<b>nodes:</b>... - object with given number of nodes"
+msgstr "<b>nodes:</b>... - objekt s daným počtem uzlů"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+msgid "<b>modified</b> - all changed objects"
+msgstr "<b>modified</b> - všechny změněné objekty"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+msgid "<b>selected</b> - all selected objects"
+msgstr "<b>selected</b> - všechny vybrané objekty"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr "<b>incomplete</b> - všechny nekompletní objekty"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+msgid "<b>untagged</b> - all untagged objects"
+msgstr "<b>untagged</b> - všechny objekty bez tagů"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr ""
+"<b>child <i>výraz</i></b> - všechny podobjekty objektů odpovídajících výrazu"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr ""
+"<b>parent <i>výraz</i></b> - všechny rodiče objektů odpovídajících výrazu"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
+msgstr "Použijte <b>|</b> nebo <b>OR</b> ke kombinaci s logickým \"nebo\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
+msgstr ""
+"Použijte <b>\"</b> jako uvozovky (například pokud klíč obsahuje dvojtečku)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
+msgid "Use <b>(</b> and <b>)</b> to group expressions"
+msgstr "Použijte <b>(</b> a <b>)</b> k seskupení výrazů"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145
+msgid "Search"
+msgstr "Hledat"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+msgid "Start Search"
+msgstr "Začít hledání"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#, java-format
+msgid "No match found for ''{0}''"
+msgstr "Nebyly nalezeny záznamy pro \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+#, java-format
+msgid "Nothing added to selection by searching for ''{0}''"
+msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+#, java-format
+msgid "Nothing removed from selection by searching for ''{0}''"
+msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+#, java-format
+msgid "Found {0} matches"
+msgstr "Nalezeno {0} odpovídajích výrazů"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
+msgid "CS"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
+msgid "CI"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235
+msgid "RX"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
+"\n"
+"{2}"
+msgstr ""
+"Regulární výraz \"{0}\" má chybu na pozici {1}, celá chyba:\n"
+"\n"
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:173
+msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:215
+#, java-format
+msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:355
+#, java-format
+msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr "Neznámý prvek: {0}. Povolené hodnoty jsou bod, cesta nebo relace"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:496
+#, java-format
+msgid "Unexpected token: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:516
+msgid "Missing arguments for or."
+msgstr "Chybějící argument pro \"NEBO\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:526
+msgid "Missing argument for not."
+msgstr "Chybějící argument pro \"NOT\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:536
+msgid "Expected closing parenthesis."
+msgstr "Očekávám uzavírací závorku."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:598
+msgid "Wrong number of parameters for nodes operator."
+msgstr "Chybný počet parametrů pro operátor nodes."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
+#, java-format
+msgid ""
+"Incorrect value of nodes operator: {0}. Nodes operator expects number of "
+"nodes or range, for example nodes:10-20"
+msgstr ""
+"Neplatná hodnota pro operátor nodes: {0}. Je očekáváno číslo, nebo rozsah "
+"čísel, například nodes:10-20."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:607
+#, java-format
+msgid "Incorrect value of id operator: {0}. Number is expected."
+msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35
+msgid "Load Selection"
+msgstr "Nahrát výběr"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:46
+#, java-format
+msgid "Contact {0}..."
+msgstr "Kontakt {0}..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48
+msgid "Downloading..."
+msgstr "Stahuji..."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81
+#, java-format
+msgid "Could not read from URL: \"{0}\""
+msgstr "Nemohu číst z URL:\"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
+#, java-format
+msgid "Parsing error in URL: \"{0}\""
+msgstr "Chyba parsování v URL:\"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
+msgid "Error while communicating with server."
+msgstr "Chyba při komunikaci se serverem."
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:65
+#, java-format
+msgid "Add {0} {1}"
+msgstr "Přidat {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:47
+#, java-format
+msgid "Change {0} {1}"
+msgstr "Změnit {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101
+#, java-format
+msgid "Remove \"{0}\" for {1} ''{2}''"
+msgstr "Odstraněno \"{0}\" pro {1} ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
+#, java-format
+msgid "Set {0}={1} for {2} ''{3}''"
+msgstr "Nastaveno {0}={1} pro {2} ''{3}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:124
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:125
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "objekt"
+msgstr[1] "objekty"
+msgstr[2] "objekty"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114
+#, java-format
+msgid "Remove \"{0}\" for {1} {2}"
+msgstr "Odstraněno \"{0}\" pro {1} {2}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#, java-format
+msgid "Set {0}={1} for {2} {3}"
+msgstr "Nastaveno {0}={1} pro {2} {3}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70
+#, java-format
+msgid "Change relation member role for {0} {1}"
+msgstr "Změnit roli člena relace {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
+"conflict can't be added.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
+#, fuzzy
+msgid "Double conflict"
+msgstr "Vyřešit konfklikt"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
+#, java-format
+msgid ""
+"Warning: layer ''{0}'' doesn't exist anymore. Can't remove conflict for "
+"primitmive ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
+#, fuzzy, java-format
+msgid "Add conflict for ''{0}''"
+msgstr "Nebyly nalezeny záznamy pro \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:249
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:94
+msgid "Can't undo command ''{0}'' because layer ''{1}'' is not present anymore"
+msgstr "Nelze zrušit příkaz ''{0}'' protože vrstva ''{1}'' již není dostupná"
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:47
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr ""
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:69
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
+msgid "cannot resolve undecided conflict"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:109
+#, java-format
+msgid "Delete {1} {0}"
+msgstr "Smazat {1} {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:128
+#, java-format
+msgid "Delete {0} {1}"
+msgstr "Smazat {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:173
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:178
+msgid "Conflicting relation"
+msgstr "Konfliktní relace"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:174
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\" with role {2}.\n"
+"Delete from relation?"
+msgstr ""
+"Výběr \"{0}\" je používán v relaci \"{1}\" s rolí {2}.\n"
+"Smazat z relace?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+msgid "Delete from relation"
+msgstr "Odstranit z relace"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:179
+#, java-format
+msgid ""
+"Selection \"{0}\" is used by relation \"{1}\".\n"
+"Delete from relation?"
+msgstr ""
+"Výběr \"{0}\" je používán v relaci \"{1}\".\n"
+"Smazat z relace?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:402
+msgid "Split way segment"
+msgstr "Rozdělit segment cesty"
+
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:426
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you don't see) might "
+"use them.<br>Do you really want to delete?"
+msgstr ""
+"Chystáte se smazat uzly mimo oblast, jež jste stáhli.<br>To může způsobit "
+"problémy, protože jiné objekty (které nevidíte) je mohou používat."
+"<br>Opravdu je chcete smazat?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:434
+#, fuzzy
+msgid "Delete confirmation"
+msgstr "Odstranit z relace"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:47
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+msgid "Move"
+msgstr "Přesunout"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:136
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "uzel"
+msgstr[1] "uzly"
+msgstr[2] "uzly"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:162
+msgid "Purging 1 primitive"
+msgstr "Odstraňuji 1 prvek"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:187
+#, java-format
+msgid "removing reference from way {0}"
+msgstr "odstraňování reference z cesty {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:193
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+"Varování: Odstraňuji cestu {0} protože počet bodů klesl pod 2. Aktuálně je "
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
+#, java-format
+msgid "removing reference from relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:58
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:68
+#, java-format
+msgid "Remove relation member {0} {1}"
+msgstr "Odstranit člena relace {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:142
+#, java-format
+msgid "Rotate {0} {1}"
+msgstr "Otočit {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Sekvence"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in {1} {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitives"
+msgstr "Obnovit {0} prvků"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:40
+#, java-format
+msgid "Resolve version conflicts for {0} {1}"
+msgstr "Vyřešte konflikt verzí mezi {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
+#, java-format
+msgid "Resolve conflicts in node list of of way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:75
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Hlavní datová sada neobsahuje bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Použít ?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:146
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"Byl změněn směr cesty. Mají se provést zásledující změny vlastností cesty a "
+"jejích bodů, z důvodů udržení konzistence dat?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+msgid "Relation"
+msgstr "Vztah"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+msgid "Old role"
+msgstr "Stará role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+msgid "New role"
+msgstr "Nová role"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Starý klíč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Stará hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Nový klíč"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+msgid "New value"
+msgstr "Nová hodnota"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+msgid "Apply selected changes"
+msgstr "Použít zvolené změny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+msgid "Don't apply changes"
+msgstr "Neprovádět změny"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+msgid "Please select which property changes you want to apply."
+msgstr "Prosím vyberte které změny vlastností chcete použít."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:99
+msgid "Properties of "
+msgstr "Vlastnosti "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+msgid "Roles in relations referring to"
+msgstr "Role v relaci odkazující na"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+msgid "Automatic tag correction"
+msgstr "Automatická korekce popisků"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Poškozený konfigurační soubor na řádku {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:339
+#, java-format
+msgid "Cannot open preferences directory: {0}"
+msgstr "Nelze otevřít adresář s nastavením: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:364
+#, java-format
+msgid "Preferences file had errors. Making backup of old one to {0}."
+msgstr "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Předvolby uloženy na {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Nemohu nahrát předvolby. Důvod: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+msgid "Could not load preferences from server."
+msgstr "Nemohu nahrát předvolby ze serveru."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:78
+#, java-format
+msgid "already registered a conflict for primitive ''{0}''"
 msgstr ""
 
@@ -2592,34 +2909,34 @@
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:320
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
-msgstr ""
+msgstr "požadován parametr {0} > 0. Zadáno {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:132
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:90
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:166
 msgid "incomplete"
 msgstr "nekompletní"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
 msgid "Error: {0}"
 msgstr "Chyba: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:43
 #, java-format
 msgid "Warning: {0}"
 msgstr "Varování: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
 msgid "nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59
+msgstr "body"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
 msgid_plural "ways"
@@ -2628,13 +2945,13 @@
 msgstr[2] "cestami"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
 msgid "ways"
 msgstr "cesty"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:94
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
 msgid_plural "relations"
@@ -2643,22 +2960,22 @@
 msgstr[2] "relace"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
 msgid "relations"
 msgstr "vazby"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
 msgid "changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+msgstr "sada změn"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
 msgid "changesets"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+msgstr "sady změn"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:40
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:52
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2673,23 +2990,23 @@
 msgstr[2] "{0} prvků"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:131
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:174
 msgid "highway"
 msgstr "silnice"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:132
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:175
 #: build/trans_presets.java:3002
 msgid "railway"
 msgstr "železnice"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:133
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:176
 msgid "waterway"
 msgstr "vodní tok"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:134
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:177
 msgid "landuse"
 msgstr "využití oblasti (landuse)"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:181
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
 #, java-format
 msgid "{0} node"
@@ -2715,17 +3032,17 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
 msgid "no earliest version found. History is empty."
-msgstr ""
+msgstr "nenalezena starší verze. Historie je prázdná."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
 msgid "no latest version found. History is empty."
-msgstr ""
+msgstr "nenalezena novější verze. Historie je prázdná."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:30
 msgid "Didn't find an  primitive with id {0} in this dataset"
-msgstr ""
+msgstr "V této datové sadě nelze nalézt prvek s id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:36
 msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
-msgstr ""
+msgstr "V této datové sadě nelze nalézt prvek s id {0} a verzí {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:31
@@ -2733,9 +3050,9 @@
 #, java-format
 msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-msgstr ""
+msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:104
 msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-msgstr ""
+msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
@@ -2743,7 +3060,7 @@
 #, java-format
 msgid "parameter {0} not in range 0..{1}, got {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:230
+msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:231
 msgid "Area style way is not closed."
 msgstr "Cesta se stylem plochy není uzavřená."
@@ -2881,9 +3198,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
-#, java-format
-msgid " [id: {0}]"
-msgstr " [id: {0}]"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
 msgid "inactive"
@@ -2900,5 +3212,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:167
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160
 msgid "background"
 msgstr "pozadí"
@@ -2909,8 +3221,8 @@
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
-msgid "WGS84 Geographisch"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:117
+msgid "WGS84 Geographic"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -2927,5 +3239,5 @@
 "kartografické projekce.."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:149
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144
 msgid "Lambert Zone (France)"
 msgstr "Lambertova zóna (Francie)"
@@ -2948,22 +3260,137 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:43
-msgid "Could not read bookmarks."
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
+#, fuzzy, java-format
+msgid "<html>Could not read bookmarks.<br>{0}</html>"
 msgstr "Nemohu přečíst záložky."
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:57
-msgid "Could not write bookmark."
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
+#, fuzzy, java-format
+msgid "<html>Could not write bookmark.<br>{0}</html>"
 msgstr "Nemohu zapsat do záložek."
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:77
+#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
+msgid "Do not show again"
+msgstr "Znovu nezobrazovat"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:40
+#, java-format
+msgid ""
+"Failed to initialize communication with the OSM server {0}.\n"
+"Check the server URL in your preferences and your internet connection."
+msgstr ""
+"Selhalo navázání komunikace s OSM serverem {0}.\n"
+"Zkontrolujte URL serveru v nastavení a vaše připojení k internetu."
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
+#, java-format
+msgid ""
+"<html>Uploading to the server <strong>failed</strong> because your "
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Aktualizace na server <strong>selhala</strong>, protože vaše "
+"aktuální<br>datová sada nesplňuje předpoklad.<br>Chybová zpráva je:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+msgid "Precondition violation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:101
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:156
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:117
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:195
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:207
+#: build/trans_presets.java:320 build/trans_presets.java:321
+#: build/trans_presets.java:322 build/trans_presets.java:323
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:524
+#: build/trans_presets.java:525 build/trans_presets.java:526
+#: build/trans_presets.java:545 build/trans_presets.java:546
+#: build/trans_presets.java:547 build/trans_presets.java:566
+#: build/trans_presets.java:567 build/trans_presets.java:568
+#: build/trans_presets.java:587 build/trans_presets.java:588
+#: build/trans_presets.java:589 build/trans_presets.java:608
+#: build/trans_presets.java:609 build/trans_presets.java:610
+#: build/trans_presets.java:629 build/trans_presets.java:630
+#: build/trans_presets.java:631 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:1314
+#: build/trans_presets.java:1376
+msgid "unknown"
+msgstr "neznámý"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
+"security reasons. This is most likely because you are running<br>in an "
+"applet and because you didn''t load your applet from ''{1}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:117
+#, fuzzy
+msgid "Security exception"
+msgstr "Neočekávaná výjimka"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:132
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+msgstr ""
+"Nemohu se připojit k OSM serveru. Prosím zkontrolujte si připojení k "
+"internetu."
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:141
+msgid "Network exception"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
+"name ''{1}'' couldn''t be resolved. <br>Please check the API URL in your "
+"preferences and your internet connection.</html>"
+msgstr ""
+"Selhalo navázání komunikace s OSM serverem {0}.\n"
+"Zkontrolujte URL serveru v nastavení a vaše připojení k internetu."
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:173
+msgid "Unknown host"
+msgstr "Neznámé jméno počítače"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:266
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because a primitive you tried "
+"to<br>delete on the server is already deleted.<br><br>The error message is:"
+"<br>{0}</html>"
+msgstr ""
+"<html>Aktualizace <strong>selhala</strong>, protože prvek který mažete<br>je "
+"již na serveru vymazán.<br><br>Chybová zpráva je:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+msgid "Primitive already deleted"
+msgstr "Prvek byl již smazán"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:152
+#, java-format
+msgid "Warning: failed to bring extended dialog always on top. Exception: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
 msgid "Message of the day not available"
 msgstr "Zprávu dne není možné zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:82
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
 #, java-format
 msgid "- running version is {0}"
 msgstr "- běžící verze je {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:119
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
 msgid "Downloading \"Message of the day\""
 msgstr "Stahuji zprávu dne"
@@ -3023,4 +3450,6 @@
 "URL which returns osm-xml"
 msgstr ""
+"Přidat každý k původnímu výběru. Může obsahovat vyhledávací řetězec podobně "
+"jako na Googlu nebo URL vracející osm-xml"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -3042,62 +3471,57 @@
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
-#, java-format
-msgid "Unable to find translation for the locale {0}. Reverting to {1}."
-msgstr "Nelze najít překlad pro jazyk {0}. Vracím se k {1}."
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:132
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:135
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Otevřít soubor (jako GPS trasu, pokud .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:138
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Download the bounding box as raw gps"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 msgid "Launch in maximized mode"
 msgstr "Spustit přes celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:141
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Set the language."
 msgstr "Nastavit jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3107,51 +3531,51 @@
 "selection nejprve nahrajte nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Namísto --download=<bbox> můžete zadat osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:156
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
 msgid "Activating updated plugins"
 msgstr "Aktivuji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:162
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:169
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Nastavení {0} bylo odstraněno, protože se již nepoužívá."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
 msgid "File"
 msgstr "Soubor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158
 msgid "View"
 msgstr "Zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
 msgid "Tools"
 msgstr "Nástroje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Presets"
 msgstr "Předvolby"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 #, java-format
 msgid "Menu: {0}"
@@ -3159,21 +3583,21 @@
 
 #. TODO move code to an "action" like the others?
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231
 msgid "Wireframe View"
 msgstr "Drátový model"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233
 msgid "Toggle Wireframe view"
 msgstr "Přepnout drátový model"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259
 msgid "Full Screen"
 msgstr "Celá obrazovka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261
 msgid "Toggle Full Screen view"
 msgstr "Přepnout zobrazení na celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
 msgid "Audio"
 msgstr "Zvuk"
@@ -3217,53 +3641,68 @@
 msgstr "měřítko"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Zeměpisná délka na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 msgid "The name of the object at the mouse pointer."
 msgstr "Jméno objektu na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Zeměpisná šířka na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The angle between the previous and the current way segment."
 msgstr "Úhel mezi předchozím a současným úsekem cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The length of the new way segment being drawn."
 msgstr "Délka nového nakresleného segmentu trasy."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:167
 msgid "(no object)"
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:245
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:261
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:268
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
 msgid "layer not in list."
 msgstr "vrstva není v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:352
-#, java-format
-msgid "Layer {0} must be in list of layers"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:27
-msgid "Contacting the OSM server..."
-msgstr "Kontaktuji OSM server..."
-
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#, java-format
+msgid "Layer ''{0}'' must be in list of layers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:57
+#, java-format
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:63
+#, java-format
+msgid ""
+"Warning: failed to put ''please wait dialog'' always on top. Exception was: "
+"{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:76
 msgid "Error while parsing"
 msgstr "Chyba při parsování"
 
-#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:101
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:79
 msgid "File not found"
 msgstr "Soubor nebyl nalezen"
+
+#: ../core/src/org/openstreetmap/josm/gui/PrimitiveNameFormatter.java:13
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
+#, java-format
+msgid " [id: {0}]"
+msgstr " [id: {0}]"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -3285,4 +3724,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:94
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Inicializace"
@@ -3314,68 +3754,68 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:85
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:204
 msgid "Properties"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:256
+msgstr "Vlastnosti"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:90
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:300
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
 msgid "Tags"
 msgstr "Značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:250
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:66
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
 msgid "Nodes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:273
+msgstr "Body"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:100
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:245
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:360
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
 msgstr "Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:172
 msgid "No pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:175
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:176
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:183
 msgid "Nodes(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:184
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:187
 msgid "Nodes(with conflicts)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:188
 msgid "Pending conflicts in the node list of this way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:192
 msgid "Members(resolved)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -3383,27 +3823,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:196
 msgid "Members(with conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
+msgstr "Členi (s konflikty)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:197
 msgid "Pending conflicts in the member list of this relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:205
 msgid "No pending property conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:208
 msgid "Properties(with conflicts)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
+msgstr "Vlastnosti (s konflikty)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:209
 msgid "Pending property conflicts to be resolved"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
+#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:287
 msgid "Conflict Resolution"
-msgstr ""
+msgstr "Řešení konfliktů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:325
@@ -3422,10 +3862,10 @@
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
-msgstr ""
+msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMergeModel.java:778
 #, java-format
 msgid "item {0} not found in list"
-msgstr ""
+msgstr "položka {0} nenalezena v seznamu"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:220
@@ -3435,20 +3875,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:228
 msgid "Compare "
-msgstr ""
+msgstr "Porovnat "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
 msgid "My version"
-msgstr ""
+msgstr "Má verze"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:264
 msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Seznam prvků v mé datové sadě, např v lokální datové sadě"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
 msgid "Merged version"
-msgstr ""
+msgstr "Sloučená verze"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:270
@@ -3456,30 +3896,30 @@
 "List of merged elements. They will replace the my elements when the merge "
 "decisions are applied."
-msgstr ""
+msgstr "Seznam sloučených elementů. Nahradí mé elementy po potvrzení sloučení."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
 msgid "Their version"
-msgstr ""
+msgstr "Cizí verze"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:276
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Seznam prvků v cizí datové sadě, např v serverové datové sadě"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:409
 msgid "> top"
-msgstr ""
+msgstr "> vrchol"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:411
 msgid "Copy my selected nodes to the start of the merged node list"
-msgstr ""
+msgstr "Kopírovat mé vybrané body na začátek seznamu slučovaných bodů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:436
 msgid "> bottom"
-msgstr ""
+msgstr "> spodek"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:438
 msgid "Copy my selected elements to the end of the list of merged elements"
-msgstr ""
+msgstr "Kopírovat mé vybrané elementy na konec seznamu slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:465
@@ -3487,5 +3927,5 @@
 "Copy my selected elements before the first selected element in the list of "
 "merged elements"
-msgstr ""
+msgstr "Kopírovat mé vybrané elementy na začátek seznamu slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:499
@@ -3494,12 +3934,15 @@
 "merged elements"
 msgstr ""
+"Kopírovat mé vybrané elementy za vybraný element ze seznamu slučovaných "
+"elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:529
 msgid "Copy their selected element to the start of the list of merged elements"
 msgstr ""
+"Kopírovat cizí vybrané elementy na začátek seznamu slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:552
 msgid "Copy their selected elements to the end of the list of merged elements"
-msgstr ""
+msgstr "Kopírovat cizí vybrané elementy na konec seznamu slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:574
@@ -3508,4 +3951,6 @@
 "of merged elements"
 msgstr ""
+"Kopírovat cizí vybrané elementy před vybraný element ze seznamu slučovaných "
+"elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:604
@@ -3514,25 +3959,26 @@
 "merged elements"
 msgstr ""
+"Kopírovat cizí vybrané elementy za vybraný element ze seznamu slučovaných "
+"elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:632
 msgid "Up"
-msgstr ""
+msgstr "Nahoru"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:634
 msgid "Move up the selected elements by one position"
-msgstr ""
+msgstr "Posunout vybrané elementy o jednu pozici nahoru"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:664
 msgid "Down"
-msgstr ""
+msgstr "Dolu"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:666
 msgid "Move down the selected entries by one position"
-msgstr ""
+msgstr "Posunout vybrané elementy o jednu pozici dolu"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:186
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -3541,23 +3987,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:698
 msgid "Remove the selected entries from the list of merged elements"
-msgstr ""
+msgstr "Odstranit vybrané položky ze seznamu slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:727
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:764
 msgid "Freeze"
-msgstr ""
+msgstr "Blokovat"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:728
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:765
 msgid "Freeze the current list of merged elements"
-msgstr ""
+msgstr "Blokovat aktuání seznam slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:760
 msgid "Unfreeze"
-msgstr ""
+msgstr "Odblokovat"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:761
 msgid "Unfreeze the list of merged elements and start merging"
-msgstr ""
+msgstr "Odblokovat aktuání seznam slučovaných elementů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:788
@@ -3566,4 +4012,6 @@
 "<html>Click <strong>{0}</strong> to start merging my and their entries</html>"
 msgstr ""
+"<html>Kliněte <strong>{0}</strong> pro zahájení slučování mých a cizích "
+"položek</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:793
@@ -3573,4 +4021,6 @@
 "html>"
 msgstr ""
+"<html>Kliněte <strong>{0}</strong> pro dokončení slučování mých a cizích "
+"položek</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:812
@@ -3578,6 +4028,7 @@
 msgid "My version ({0} entry)"
 msgid_plural "My version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Má verze ({0} položka)"
+msgstr[1] "Má verze ({0} položky)"
+msgstr[2] "Má verze ({0} položek)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:815
@@ -3585,6 +4036,7 @@
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Sloučená verze ({0} položka)"
+msgstr[1] "Sloučená verze ({0} položky)"
+msgstr[2] "Sloučená verze ({0} položek)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:818
@@ -3592,6 +4044,7 @@
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Cizí verze ({0} položka)"
+msgstr[1] "Cizí verze ({0} položky)"
+msgstr[2] "Cizí verze ({0} položek)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:881
@@ -3606,16 +4059,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:120
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:122
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:33
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:53
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:54
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:55
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:56
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:76
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:106
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:68
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:98
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:78
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:121
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
 msgid "parameter '{0}' must not be null"
-msgstr ""
+msgstr "parametr '{0}' nesmí být null (prázdný)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:884
@@ -3635,5 +4088,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListColumnModel.java:27
 msgid "Node"
-msgstr ""
+msgstr "Bod"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListMergeModel.java:71
@@ -3642,31 +4095,31 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java:181
 #, java-format
 msgid "unexpected column index. Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
+msgstr "neočekávaný index sloupce. Zadáno {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:422
 #, java-format
 msgid ""
 "<html>An error occurred while communicating with the server<br>Details: {0}</"
 "html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
+msgstr "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:426
 msgid "Communication with server failed"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
+msgstr "Komunikace se serverem selhala"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
+msgstr "Ano, obnovit je také"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Ne, zruš operaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:473
 #, java-format
 msgid ""
@@ -3674,10 +4127,12 @@
 "the server.<br><br>Do you want to undelete these nodes too?</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
+"<html>Je zde dalších {0} bodů použitých v cestě {1}<br>které byly smazány na "
+"serveru.<br><br>Chcete obnovit také tyto body?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:478
 msgid "Undelete additional nodes?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
+msgstr "Obnovit další body?"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:501
 #, java-format
 msgid ""
@@ -3686,105 +4141,109 @@
 "</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
+"<html>Je zde dalších {0} prvků na něž odkazuje relace {1}<br>a jsou smazány "
+"na serveru.<br><br>Chcete je obnovit také?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
+msgstr "Obnovit závislé prvky?"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:83
 msgid "Properties in my dataset, i.e. the local dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
+msgstr "Vlastnosti v mé datové sadě, např lokální datové sadě"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:89
 msgid ""
 "Properties in the merged element. They will replace properties in my "
 "elements when merge decisions are applied."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
+"Vlastnosti slučovaného prvku. Nahradí vlastnosti v mých prvcích pokud bude "
+"sloučení aplikováno."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:95
 msgid "Properties in their dataset, i.e. the server dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
+msgstr "Vlastnosti v cizí datové sadě, např serverová datová sada"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:111
 msgid "Coordinates:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
+msgstr "Souřadnice:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:187
 msgid "Deleted State:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
+msgstr "Stav smazáno:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
 msgid "Visible State:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373
+msgstr "Stav viditelné:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:356
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:374
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357
+msgstr "(žádný)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:358
 msgid "deleted"
 msgstr "smazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:360
 msgid "not deleted"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
+msgstr "nesmazáno"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:367
 msgid "visible (on the server)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
+msgstr "viditelný (na serveru)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:369
 msgid "not visible (on the server)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
+msgstr "neviditelný (na serveru)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:376
 msgid "Keep a clone of the local version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
+msgstr "Ponechat klon lokální verze"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:378
 msgid "Physically delete from local dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
+msgstr "Fyzicky odstranit z lokální datové sady"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:477
 msgid "Keep my coordiates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
+msgstr "Ponechat mé souřadnice"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:492
 msgid "Keep their coordiates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
+msgstr "Ponechat cizí souřadnice"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:507
 msgid "Undecide conflict between different coordinates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
+msgstr "Nerozhodnutý konflikt rozdílných souřadnic"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:522
 msgid "Keep my deleted state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
+msgstr "Ponechat můj stav vymazáno"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:537
 msgid "Keep their deleted state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
+msgstr "Ponechat cizí stav vymazáno"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:552
 msgid "Undecide conflict between deleted state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
+msgstr "Nerozhodnutý konflikt stavu vymazáno"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:567
 msgid "Keep my visible state"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
+msgstr "Ponechat můj stav viditelné"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
 msgid "Yes, reset the id"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
+msgstr "Ano, resetovat id"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:583
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
 msgid "No, abort"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
+msgstr "Ne, zrušit"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:587
 #, java-format
 msgid ""
@@ -3793,16 +4252,19 @@
 "agree?</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
+"<html>Pro ponechání vaší lokální verze, JOSM<br>resetuje id {0} {1} na 0."
+"<br>Při přístí aktualizaci na server bude přidělěno<br>nové id."
+"<br>Souhlasíte s tím?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:595
 msgid "Reset id to 0"
-msgstr ""
+msgstr "Resetovat id na 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
 msgid "Keep their visible state"
-msgstr ""
+msgstr "Ponechat cizí stav viditelné"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
 msgid "Yes, purge it"
-msgstr ""
+msgstr "Ano, vyčistit to"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
@@ -3812,17 +4274,18 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM odstraní lokální prvek s id {0}<br>z datové sady.<br>Souhlasíte?</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
 msgid "Remove from dataset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
+msgstr "Odstranit z datové sady"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:646
 msgid "Undecide conflict between visible state"
-msgstr ""
-
-#. setting up the member table
+msgstr "Nerozhodnutý konflikt stavu viditelné"
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
 msgid "Role"
@@ -3832,9 +4295,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
 msgid "Primitive"
-msgstr ""
+msgstr "Prvek"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberListMergeModel.java:124
 msgid "merged nodes not frozen yet. Can't build resolution command"
-msgstr ""
+msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:37
@@ -3849,5 +4312,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:51
 msgid "<undefined>"
-msgstr ""
+msgstr "<nedefinováno>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MergedTableCellRenderer.java:38
@@ -3857,5 +4320,5 @@
 #, java-format
 msgid "The merged dataset will not include a tag with key {0}"
-msgstr ""
+msgstr "Sloučená datová sada nebude obsahovat tag s klíčem {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MineTableCellRenderer.java:48
@@ -3863,14 +4326,14 @@
 #, java-format
 msgid "My dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Má datová sada neobsahuje tag s klíčem {0}"
 
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:161
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:110
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:234
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:262
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
@@ -3879,10 +4342,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:192
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:480
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:68
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:238
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -3891,7 +4354,7 @@
 msgstr "Hodnota"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
-msgstr ""
+msgstr "nelze aplikovat nerozhodnutou položku slučování tagů"
 
 #. should not happen, but just in case
@@ -3899,34 +4362,34 @@
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
-msgstr ""
+msgstr "Parametr 'col'  musí být 0 nebo 1. Zadáno {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:126
 msgid "My version (local dataset)"
-msgstr ""
+msgstr "Má verze (lokální datová sada)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:149
 msgid "Their version (server dataset)"
-msgstr ""
+msgstr "Cizí verze (serverová datová sada)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:257
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:286
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:259
 msgid "Keep the selected key/value pairs from the local dataset"
-msgstr ""
+msgstr "Ponechat vybrané páry klíč/hodnota z lokální datové sady"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:288
 msgid "Keep the selected key/value pairs from the server dataset"
-msgstr ""
+msgstr "Ponechat vybrané páry klíč/hodnota ze serverové datové sady"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:380
 msgid "Undecide"
-msgstr ""
+msgstr "Nerozhodnuto"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
-msgstr ""
+msgstr "Označit vybrané tagy jako nerozhodnuté"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TheirTableCellRenderer.java:48
@@ -3934,5 +4397,5 @@
 #, java-format
 msgid "Their dataset does not include a tag with key {0}"
-msgstr ""
+msgstr "Cizí datová sada neobsahuje tag s klíčem {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -3949,9 +4412,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -3959,5 +4422,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:98
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75
 #, java-format
 msgid "Toggle: {0}"
@@ -3989,42 +4452,63 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
 msgid ""
 "Set the selected elements on the map to the selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:141
+msgid ""
+"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. "
+"Exception: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
+msgid "Cancel conflict resolution and close the dialog"
+msgstr "Zrušit řešení konfliktu a zavřít dialog"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:186
+msgid "Apply resolved conflicts and close the dialog"
+msgstr "Aplikovat řešení konfliktů a zavřít dialog"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:187
+msgid "Apply Resolution"
+msgstr "Aplikovat řešení"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
+#, fuzzy
+msgid "Close anyway"
+msgstr "Přesto pokračovat"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
+msgid "Continue resolving"
+msgstr "Pokračovat v řešení"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
+#, fuzzy, java-format
+msgid ""
+"<html>You didn''t finish to merge the differences in this conflict."
+"<br>Conflict resolutions won't be applied unless all differences<br>are "
+"resolved.Click <strong>{0}</strong> to close anyway."
+"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
+msgstr ""
+"<html>Nedokončil jste řešení všech konfliktů.<br>Kliněte <strong>{0}</"
+"strong> pro aplikování již vyřešených konfliktů.<br>Zbývající konflikty "
+"můžete vyřešit později.<br>Klikněte <strong>{1}</strong> pro návrat k řešení "
+"konfliktů.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
+msgid "Conflict not resolved completely"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246
 msgid "Resolve conflicts"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
-msgid "Cancel conflict resolution and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
-msgid "Apply resolved conflicts and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
-msgid "Apply Resolution"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
-msgid "Apply partial resolutions"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
-msgid "Continue resolving"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
-#, java-format
-msgid ""
-"<html>You didn''t finish to resolve all conflicts.<br>Click <strong>{0}</"
-"strong> to apply already resolved conflicts anyway.<br>You can resolve the "
-"remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
-"resolving conflicts.</html>"
-msgstr ""
+msgstr "Vyřešit konflikty"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+#, fuzzy, java-format
+msgid "Resolve conflicts for ''{0}''"
+msgstr "Vyřešte konflikt verzí mezi {0} {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
@@ -4040,98 +4524,132 @@
 #, java-format
 msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:309
+msgstr "<html>Selhalo nahrávání historie ze serveru. Detaily:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311
 #, java-format
 msgid "index out of bounds Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:364
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366
 msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:385
+msgstr "Položka historie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387
 msgid "Load history"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:410
+msgstr "Nahrát hostorii"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:414
 #, java-format
 msgid "Loading history for {0} with id {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:486
+msgstr "Nahrávám historii pro {0} s id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451
 msgid "Reload all currently selected objects and refresh the list."
 msgstr "Znovu nahrát vybrané objekty a obnovit seznam."
 
 #. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:474
 msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:506
+msgstr "Zobrazit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475
 msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:65
+msgstr "Zobrazit historii vybraného prvku"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:85
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:143
+msgid "Layers"
+msgstr "Vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:142
+msgid "Open a list of all loaded layers."
+msgstr "Otevřít seznam všech nahraných vrstev."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:272
 msgid "Delete the selected layer."
 msgstr "Smazat označenou vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:80
-msgid "There are unsaved changes. Delete the layer anwyay?"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
+#, fuzzy, java-format
+msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
 msgstr "Jsou zde neuložené změny. Přesto smazat vrstvu?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
 msgid "Delete Layer"
 msgstr "Smazat vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
-msgid "Do you really want to delete the whole layer?"
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:308
+#, fuzzy, java-format
+msgid "Do you really want to delete layer ''{0}''?"
 msgstr "Opravdu chcete smazat celou vrstvu?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
+#, fuzzy
+msgid "Confirmation"
+msgstr "Informace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:300
+#, fuzzy
+msgid "Yes"
+msgstr "ano"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:301
+#, fuzzy
+msgid "No"
+msgstr "S"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:302
+#, fuzzy
+msgid "Delete all"
+msgstr "Smazat"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:309
+#, fuzzy, java-format
+msgid "Deleting layer {0} of {1}"
+msgstr "Smazat {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
 msgid "Show/Hide"
 msgstr "Zobrazit/Skrýt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:422
 msgid "Toggle visible state of the selected layer."
 msgstr "Přepnout viditelnost zvolené vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:123
-msgid "Show/Hide Text/Icons"
-msgstr "Zobrazit/Skrýt Text/Ikony"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:124
-msgid "Toggle visible state of the marker text and icons."
-msgstr "Přepnout viditelnost textu značek a ikon."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
-msgid "Layers"
-msgstr "Vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:164
-msgid "Open a list of all loaded layers."
-msgstr "Otevřít seznam všech nahraných vrstev."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:250
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
+#, fuzzy
+msgid "Activate"
+msgstr "soukromý"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
+#, fuzzy
+msgid "Activate the selected layer"
+msgstr "Smazat označenou vrstvu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:516
+#, fuzzy
+msgid "Merge this layer into another layer"
+msgstr "Spojit vrstvy pod označenou"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row up."
 msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:253
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:641
 msgid "Move the selected layer one row down."
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
-msgid "Merge the layer directly below into the selected layer."
-msgstr "Spojit vrstvy pod označenou"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:292
-#, java-format
-msgid "Layers: {0}"
-msgstr "Vrstvy: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
+#, fuzzy
+msgid "Information about layer"
+msgstr "Informační nástěnka"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 #, java-format
 msgid "This will change up to {0} object."
@@ -4141,22 +4659,28 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:144
 msgid "An empty value deletes the key."
 msgstr "Prázdná hodnota smaže klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:493
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:536
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:96
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:187
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:496
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:538
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
 msgid "<different>"
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:203
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
 msgid "Change values?"
 msgstr "Změnit hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:266
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:205
+#, java-format
+msgid ""
+"Warning: failed to put properties dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4166,84 +4690,89 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
 msgid "Please select a key"
 msgstr "Prosím zvolte klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#, java-format
+msgid "Warning: failed to put dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
 msgid "Please select the objects you want to change properties for."
 msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:476
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:472
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:475
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:508
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:511
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:582
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:583
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:625
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:624
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:626
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:122
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:85
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:125
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:88
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:196
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:67
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
 msgid "Add"
 msgstr "Přidat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:628
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:627
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:631
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:630
 msgid "Edit Properties"
 msgstr "Upravit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:634
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:633
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:637
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:636
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:640
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:639
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:840
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:842
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:843
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
@@ -4252,63 +4781,65 @@
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:70
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:147
 #: build/trans_presets.java:2967
 msgid "Relations"
 msgstr "Relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 msgid "Open a list of all relations."
 msgstr "Otevřít seznam všech relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:145
+#, java-format
+msgid "Relations: {0}"
+msgstr "Relace: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:243
+msgid "Open an editor for the selected relation"
+msgstr "Otevřít editor pro zvolenou relaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:284
+msgid "Delete the selected relation"
+msgstr "Smazat vybrané relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:316
 msgid "Create a new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:139
-#, java-format
-msgid "Relations: {0}"
-msgstr "Relace: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:245
-msgid "Open an editor for the selected relation"
-msgstr "Otevřít editor pro zvolenou relaci"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:274
-msgid "Delete the selected relation"
-msgstr "Smazat vybrané relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Current Selection"
 msgstr "Současný výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
 msgid "Open a selection list window."
 msgstr "Otevřít okno s výběrem."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
 msgid "Zoom to selected element(s)"
 msgstr "Přiblížit na zvolené prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:134
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Refresh the selection list."
 msgstr "Obnovit výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:157
 msgid "Zoom to selection"
 msgstr "Přiblížit na výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:278
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:290
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Výběr: Rel.:{0} / Cest:{1} / Uzlů:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
 msgstr "Výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:320
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
 #, java-format
 msgid "{0} way"
@@ -4318,5 +4849,5 @@
 msgstr[2] "{0} cest"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:326
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
 #, java-format
 msgid "{0} relation"
@@ -4326,5 +4857,5 @@
 msgstr[2] "{0} relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
 msgid "Selection: {0}"
@@ -4335,5 +4866,10 @@
 msgstr "Vytrhnout panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:167
+#, java-format
+msgid "Warning: failed to put toggle dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:215
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4342,143 +4878,413 @@
 "nástrojů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227
 msgid "Click to minimize/maximize the panel content"
 msgstr "Minimalizovat nebo maximalizovat obsah panelu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:54
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:125
 msgid "Authors"
 msgstr "Autoři"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
 msgid "Open a list of people working on the selected objects."
 msgstr "Otevřít seznam lidí, kteří pracuji na zvoleném objektu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59
 msgid "Author"
 msgstr "Autor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59
 msgid "# Objects"
 msgstr "# Objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123
 #, java-format
 msgid "Authors: {0}"
 msgstr "Autoři: {0}"
 
-#. We need this twice, so cache result
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:109
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:99
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1377
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+#, fuzzy
+msgid "Download all child relations (recursively)"
+msgstr "Stáhnout členy relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
+#, fuzzy
+msgid "Download All Children"
+msgstr "Stáhnout plochu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
+#, fuzzy
+msgid "Download selected relations"
+msgstr "Smazat vybrané relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
+#, fuzzy
+msgid "Download Selected Children"
+msgstr "Nahrát viditelné dlaždice"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:292
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:452
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1459
+msgid "Download relation members"
+msgstr "Stáhnout členy relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:488
+msgid "Conflicts in data"
+msgstr "Konflikty v datech"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346
+#, java-format
+msgid ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It can't be "
+"loaded"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
+#, fuzzy
+msgid "Relation is deleted"
+msgstr "Nevybrána žádná relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
+#, fuzzy, java-format
+msgid "Downloading relation {0}"
+msgstr "Stahuji Plugin {0}..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:432
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:534
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1523
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#, java-format
+msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+msgid "Tags and Members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
+msgid "Parent Relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
+#, fuzzy
+msgid "Child Relations"
+msgstr "Relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:186
+#, java-format
+msgid ""
+"Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: {0}"
+msgstr ""
+
+#. --- role editing
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:593
+msgid "Role:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:651
+msgid ""
+"<html>There is at least one member in this relation referring<br>to the "
+"relation itself.<br>This creates circular dependencies and is dicuraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:659
+#, fuzzy
+msgid "Remove them, clean up relation"
+msgstr "Prvek odstraněn z relací"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+msgid "Ignore them, leave relation as is"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:683
+#, java-format
+msgid ""
+"<html>This relation already has one or more members referring to<br>the "
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:693
+msgid "Multiple members referring to same primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:711
+#, java-format
+msgid ""
+"<html>You are trying to add a relation to itself.<br><br>This creates "
+"circular references and is therefore discouraged.<br>Skipping relation "
+"''{0}''.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:752
+msgid ""
+"Add all primitives selected in the current dataset before the first member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:778
+msgid ""
+"Add all primitives selected in the current dataset after the last member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
+msgid ""
+"Add all primitives selected in the current dataset before the first selected "
+"member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
+msgid ""
+"Add all primitives selected in the current dataset after the last selected "
+"member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#, fuzzy
+msgid "Remove all members referring to one of the selected primitives"
+msgstr "Nepodařilo se aktualizovat vybraná primitiva,"
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:875
+msgid "Relation Editor: Remove Selected"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+msgid "Sort the relation members"
+msgstr ""
+
+#. putValue(NAME, tr("Sort"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
+msgid "Relation Editor: Sort"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:919
+msgid "Move the currently selected members up"
+msgstr "Přesunout zvolené prvky nahoru"
+
+#. putValue(NAME, tr("Move Up"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:922
+msgid "Relation Editor: Move Up"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
+msgid "Move the currently selected members down"
+msgstr "Přesunout zvolenou vrstvu o řádek dolů."
+
+#. putValue(NAME, tr("Move Down"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:941
+msgid "Relation Editor: Move Down"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:957
+#, fuzzy
+msgid "Remove the currently selected members from this relation"
+msgstr "Odebere všechny označené objekty z relace"
+
+#. putValue(NAME, tr("Remove"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:960
+msgid "Relation Editor: Remove"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#, fuzzy
+msgid "Delete the currently edited relation"
+msgstr "Smazat vybrané relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1059
+msgid "Yes, create a conflict and close"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#, fuzzy
+msgid "No, continue editing"
+msgstr "Pokračovat v řešení"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1064
+msgid ""
+"<html>This relation has been changed outside of the editor.<br>You can't "
+"apply your changes and continue editing.<br><br>Do you want to create a "
+"conflict and close the editor?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1068
+#, fuzzy
+msgid "Conflict in data"
+msgstr "Konflikty v datech"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1099
+#, fuzzy
+msgid "Apply the current updates"
+msgstr "Uložit aktuální data."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1101
+msgid "Apply"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1132
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1134
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1166
+msgid "Cancel the updates and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1183
+msgid "Add an empty tag"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+msgid "Delete the currently selected tags"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+msgid "Download all incomplete ways and nodes in relation"
+msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
+msgid "Download Members"
+msgstr "Stáhnout prvky"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1264
+msgid "Relation Editor: Download Members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
+msgid "Sets a role for the selected members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+msgid "Apply Role"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+#, java-format
+msgid ""
+"<html>You are setting an empty role on {0} primitives.<br>This is equal to "
+"deleting the roles of these primitives.<br>Do you really want to apply the "
+"new role?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1302
+#, fuzzy
+msgid "Yes, apply it"
+msgstr "Ano, vyčistit to"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
+msgid "No, don't apply"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
+#, fuzzy
+msgid "Confirm empty role"
+msgstr "Potvrdit akci dálkového ovládání"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1354
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
+#, fuzzy
+msgid "Zoom to"
+msgstr "Oddálit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
+#, fuzzy
+msgid "Zoom to primitive the first selected member refers to"
+msgstr "Přesunout zvolenou vrstvu o řádek dolů."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+msgid "Zooming disabled because layer of this relation is not active"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225
+msgid "Zooming disabled because there is no selected member"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:24
+msgid "Refers to"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:32
+msgid "Linked"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+msgid "Download referring relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#, java-format
+msgid "child.id >0 expected. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78
+msgid "including immediate children of parent relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+msgid "Load parent relations"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157
+msgid "Edit the currently selected relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
 msgid "Apply Changes"
 msgstr "Aplikovat změny"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:182
-msgid "Basic"
-msgstr "Základní"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217
-msgid "Occupied By"
-msgstr "Obsazeno"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:217
-msgid "linked"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310
-msgid "Move Up"
-msgstr "Posunout nahoru"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:310
-msgid "Move the currently selected members up"
-msgstr "Přesunout zvolené prvky nahoru"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:316
-msgid "Add Selected"
-msgstr "Přidat vybrané"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:317
-msgid "Add all currently selected objects as members"
-msgstr "Přidat všechny zvolené objekty mezi prvky"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:323
-msgid "Remove Selected"
-msgstr "Odebrat označené"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:324
-msgid "Remove all currently selected objects from relation"
-msgstr "Odebere všechny označené objekty z relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:330
-msgid "Sort"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
-msgid "Sort the selected relation members or the whole list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337
-msgid "Move Down"
-msgstr "Posunout dolů"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:337
-msgid "Move the currently selected members down"
-msgstr "Přesunout zvolenou vrstvu o řádek dolů."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:344
-msgid "Remove the member in the current table row from this relation"
-msgstr "Odstranit prvek v aktuálním řádku tabulky z relace"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:357
-msgid "Download Members"
-msgstr "Stáhnout prvky"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:358
-msgid "Download all incomplete ways and nodes in relation"
-msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:733
-#, java-format
-msgid "Members: {0} (linked: {1})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:741
-#, java-format
-msgid "Relation Editor: {0}"
-msgstr "Editor relací: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:846
-msgid "Download relation members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:898
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
-#, java-format
-msgid "There were {0} conflicts during import."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902
-msgid "Conflicts in data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
-#, java-format
-msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:118
 #, java-format
 msgid "Create new relation in layer ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:96
+msgstr "Vytvořit novou relaci ve vrstvě \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
 #, java-format
 msgid "Edit new relation in layer ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:97
+msgstr "Upravit novou relaci ve vrstvě \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:122
 #, java-format
 msgid "Edit relation #{0} in layer ''{1}''"
+msgstr "Upravit relaci #{0} ve vrstvě \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
+#, fuzzy
+msgid "Load relation"
+msgstr "Nahrát výběr"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
+msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
 
@@ -4488,5 +5294,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:351
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
 #, java-format
@@ -4497,26 +5303,22 @@
 msgstr[2] "Odstranit staré klíče z {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagEditorModel.java:392
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
-#, java-format
-msgid "Updating properties of up to {0} object"
-msgid_plural "Updating properties of up to {0} objects"
-msgstr[0] "Upravit vlastnosti {0} objektů"
-msgstr[1] "Upravit vlastnosti {0} objektu"
-msgstr[2] "Upravit vlastnosti {0} objektů"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:80
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
 msgid "Please enter the desired coordinates first."
 msgstr "Prosím zadejte nejdříve pozadovanou pozici"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
 msgid "Please enter a name for the location."
 msgstr "Prosím zadejte jméno umístění"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:91
+#, fuzzy
+msgid "Name of location"
+msgstr "Změnit umístění"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
 msgid "Select a bookmark first."
 msgstr "Nejdříve zvolte záložku"
@@ -4549,34 +5351,34 @@
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
 msgid "Data Sources and Types"
 msgstr "Zdroje a typy dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:170
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
 msgid "Download as new layer"
 msgstr "Uložit jako novou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
 msgid "Download Area"
 msgstr "Stáhnout plochu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Stahovaná plocha je moc velká, server zřejmě odmítne váš požadavek"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Stahovaná plocha je v pořádku, velikost akceptována serverem"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:120
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Výjimka desetinné čárky, pravděpodobně nějaké chybějící tagy."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:171
 msgid "Please enter a search string"
 msgstr "Prosím, zadejte hledaný řetězec"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:186
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195
 msgid "Cannot read place search results from server"
 msgstr "Nemohu načíst výsledky hledání ze serveru"
@@ -4584,5 +5386,5 @@
 #. this is manually tuned so that it looks nice on a GNOME
 #. desktop - maybe needs some cross platform proofing.
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:206
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:217
 msgid "Enter a place name to search for:"
 msgstr "Zadej jméno místa které chceš najít:"
@@ -4590,5 +5392,5 @@
 #. item "Health/Veterinary" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:218
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
 #: build/trans_presets.java:2612
 msgid "Places"
@@ -4596,6 +5398,6 @@
 
 #. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:235
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:241
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
 msgid "name"
 msgstr "jméno"
@@ -4634,6 +5436,6 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:236
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:242
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -4656,15 +5458,15 @@
 msgstr "typ"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:237
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254
 msgid "near"
 msgstr "poblíž"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:238
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255
 msgid "zoom"
 msgstr "Zvětšení"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -4672,6 +5474,9 @@
 "Click."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
+"<b>Zvětšení:</b> Kolečko myši, dvojklik nebo Ctrl + Up/Down <b>Posun mapy:</"
+"b> Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. <b>Výběr:</"
+"b> Klik."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124
 msgid "Slippy map"
 msgstr "Aktuální mapa"
@@ -4701,9 +5506,15 @@
 #, java-format
 msgid "History for {0} {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:117
+msgstr "Historie pro {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:74
+#, java-format
+msgid ""
+"Warning: failed to put history browser always on top. Exception was: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:121
 msgid "Close the dialog"
-msgstr ""
+msgstr "Zavřít dialog"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
@@ -4734,5 +5545,5 @@
 #, java-format
 msgid "Node {0}"
-msgstr ""
+msgstr "Bod {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -5443,5 +6254,5 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 #: build/trans_presets.java:64 build/trans_presets.java:100
 #: build/trans_presets.java:140 build/trans_presets.java:177
@@ -5598,69 +6409,71 @@
 "<strong>{2}</strong></html>"
 msgstr ""
+"<html>Verze <strong>{0}</strong> vytvořená na <strong>{1}</strong> "
+"uživatelem <strong>{2}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
 #, java-format
 msgid "Version {0} created on {1} by {2}"
-msgstr ""
+msgstr "Verze {0} vytvořená na {1} uživatelem {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
 msgid "Version"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
+msgstr "Verze"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
 #, java-format
 msgid "Images for {0}"
 msgstr "Obrázky pro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
 msgid "Read GPX..."
 msgstr "Číst GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:292
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
 #, java-format
 msgid "No time for point {0} x {1}"
 msgstr "Žádný čas pro bod {0} x {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:309
 #, java-format
 msgid "Cannot read time \"{0}\" from point {1} x {2}"
 msgstr "Nelze přečíst čas \"{0}\" z bodu {1} x {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:305
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:322
 msgid "No images with readable timestamps found."
 msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:316
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:140
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:332
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Čtu {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:247
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Start GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Konec GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
 #, java-format
 msgid "current delta: {0}s"
 msgstr "nynější odchylka: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
 msgid "timezone difference: "
 msgstr "rozdíl časových pásem: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:285
 msgid "image"
 msgid_plural "images"
@@ -5669,138 +6482,128 @@
 msgstr[2] "obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
 #, java-format
 msgid "{0} within the track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
 msgid "Sync clock"
 msgstr "Synchronizovat hodiny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:287
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
 msgid "JPEG images (*.jpg)"
 msgstr "JPEG obrázky (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:704
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
 #, java-format
 msgid "The date in file \"{0}\" could not be parsed."
 msgstr "Data v souboru \"{0}\" nemohla být parsována."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:708
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
 #, java-format
 msgid "There is no EXIF time within the file \"{0}\"."
 msgstr "V souboru \"{0}\" není časová značka EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:712
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:751
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 msgstr "Zadejte datum ve tvaru (mm/dd/rrrr HH:MM:SS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:756
 msgid "GPS unit timezone (difference to photo)"
 msgstr "časové pásmo GPS jednotky (rozdíl oproti forografii)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:725
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:768
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synchronizace času s GPS přijímačem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:741
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
 msgid "Time entered could not be parsed."
 msgstr "Zadaný čas nemůže být rozparsován"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:111
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 msgid "gps point"
 msgstr "gps bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:115
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:186
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:116
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
 msgid "Use global settings."
 msgstr "Použít globální nastavení."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:120
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
 msgid "Draw lines between points for this layer."
 msgstr "Kreslit spojnice mezi body v této vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Do not draw lines between points for this layer."
 msgstr "Nereslit spojnice mezi body v této vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:144
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:215
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:153
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 msgid "Customize Color"
 msgstr "Přizpůsobit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:149
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:158
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:150
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:162
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Zvolit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:181
 msgid "Markers From Named Points"
 msgstr "Značky z pojmenovaných bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:177
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:196
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pojmenované body z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:204
 msgid "Import Audio"
 msgstr "Importovat zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosoubory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:229
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:256
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:271
 msgid "Import images"
 msgstr "Importovat obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:314
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:330
 #, java-format
 msgid "{0} track, "
@@ -5810,5 +6613,5 @@
 msgstr[2] "{0} cesty, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:331
 #, java-format
 msgid "{0} route, "
@@ -5818,5 +6621,5 @@
 msgstr[2] "{0} trasy, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:316
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
 #, java-format
 msgid "{0} waypoint"
@@ -5826,30 +6629,30 @@
 msgstr[2] "{0} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:320
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:335
 #, java-format
 msgid "Name: {0}"
 msgstr "Jméno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:323
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:339
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
 #, java-format
 msgid "Description: {0}"
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:347
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:364
 msgid "Timespan: "
 msgstr "Časové rozpětí: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:354
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:371
 msgid "Length: "
 msgstr "Délka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:664
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:695
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:58
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:668
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:703
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -5859,43 +6662,43 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:669
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:689
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:513
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:83
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Převedeno z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:726
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:748
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:774
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
 msgid "Download from OSM along this track"
 msgstr "Stáhnout data z OSM podél této trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:712
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:756
 msgid "Download everything within:"
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:759
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:718
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:763
 msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:721
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:766
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:865
 #, java-format
 msgid ""
@@ -5906,9 +6709,9 @@
 "pokračovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:888
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:961
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Není dostupná žádná GPX trasa pro kterou by šel asociovat zvuk."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1130
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -5916,5 +6719,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1136
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -5924,47 +6727,47 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:87
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:166
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
 msgid "outside downloaded area"
 msgstr "mimo stažený areál"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:245
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
 #, java-format
 msgid "version {0}"
 msgstr "verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:407
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skládá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:410
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} smazáno.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
 msgid "unset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:414
+msgstr "nenastaveno"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
 #, java-format
 msgid "API version: {0}"
 msgstr "Verze API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:204
 msgid "Convert to GPX layer"
 msgstr "Převédst do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:151
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:155
 #: build/trans_presets.java:1845 build/trans_presets.java:1851
 #: build/trans_presets.java:1857 build/trans_presets.java:1863
@@ -5990,5 +6793,5 @@
 msgstr[2] "trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:152
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:156
 msgid "point"
 msgid_plural "points"
@@ -5997,5 +6800,5 @@
 msgstr[2] "body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185
 #, java-format
 msgid "a track with {0} point"
@@ -6005,5 +6808,5 @@
 msgstr[2] "trasy s {0} body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6013,5 +6816,5 @@
 msgstr[2] "{0} se skládá z {1} tras"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
 #, java-format
 msgid "{0} point"
@@ -6032,5 +6835,5 @@
 msgstr[2] "značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6040,29 +6843,29 @@
 msgstr[2] "{0} se skládá z  {1} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:216
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:224
 msgid "Synchronize Audio"
 msgstr "Synchronizovat audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:221
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:231
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Zvuk zesynchronizován na bodu {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:228
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
 msgid "Unable to synchronize in layer being played."
 msgstr "Není možno synchronizovat v již přehrávané vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:256
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:263
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -6070,10 +6873,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:310
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:342
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#. Not close enough to track, or no audio marker found for some other reason
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:451
+msgid "Show/Hide Text/Icons"
+msgstr "Zobrazit/Skrýt Text/Ikony"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Přepnout viditelnost textu značek a ikon."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -6081,5 +6891,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:213
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
@@ -6087,29 +6897,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:223
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
 msgid "Unable to create new audio marker."
 msgstr "Není možné vztvořit novou zvukovou značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 msgid "There was an error while trying to display the URL for this marker"
 msgstr "Při pokusu o zobrazení URL pro tuto značku došlo k chybě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 msgid "(URL was: "
 msgstr "(URL bylo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46
 msgid "Error displaying URL"
 msgstr "Chyba při zobrazování URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
 msgid "Advanced Preferences"
 msgstr "Pokročilé volby"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51
 msgid "Setting Preference entries directly. Use with caution!"
 msgstr "Ruční nastavení. Používejte s opatrností!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:54
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -6117,26 +6927,26 @@
 msgstr "Hledání: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:99
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
 msgid "Current value is default."
 msgstr "Nynějsí hodnota je výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Výchozí hodnota je''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
 msgid "Default value currently unknown (setting has not been used yet)."
 msgstr "Výchozí hodnota není známa ( ještě nebyla definována )"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:211
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:138
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:173
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 msgid "Please select the row to edit."
 msgstr "Zvolte řádek k editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
 #, java-format
@@ -6144,14 +6954,14 @@
 msgstr "Nová hodnota pro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:152
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:186
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:238
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:90
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96
 msgid "Please select the row to delete."
 msgstr "Zvolte řádek k vymazání"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:240
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270
 msgid "Enter a new key/value pair"
 msgstr "Zadejte novou dvojici klíč/hodnota"
@@ -6274,40 +7084,40 @@
 msgstr "Kalibrace nahrávání zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 msgid "Color"
 msgstr "Barva"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Styl kreslení {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
 msgstr "Vrstva: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Vybrat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:158
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Zvolte barvu pro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Nastavit na výchozí hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:174
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Nastavit vše na výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Barvy použité různými objekty v JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Barvy"
@@ -6641,48 +7451,57 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:60
 msgid "Used style"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:44
+msgstr "Použitý styl"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46
 msgid "Configure available plugins."
 msgstr "Nastavení dostupných pluginů."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
 msgid "Download List"
 msgstr "Stáhnout seznam"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:57
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:206
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:260
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:65
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
 msgid "Configure Sites..."
 msgstr "Konfigurovat zařízení..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:78
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:95
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:93
+msgid "Enter URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
 msgid "Please select an entry."
 msgstr "Prosím, vyberte položku."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:115
+#, fuzzy
+msgid "JOSM Plugin description URL"
+msgstr "Popis symbolu"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
 msgid "Configure Plugin Sites"
 msgstr "Nastavení webů s pluginy"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid "Display Settings"
 msgstr "Nastavení zobrazení"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -6690,29 +7509,29 @@
 msgstr "Různá nastavení ovlivňující vzhled celého programu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Connection Settings"
 msgstr "Nastavení připojení"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Connection Settings for the OSM server."
 msgstr "Nastavení připojení pro OSM server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Map Settings"
 msgstr "Nastavení mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Settings for the map projection and data interpretation."
 msgstr "Nastavení projekce mapy a interpretace dat."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
 msgid "Audio Settings"
 msgstr "Nastavení zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
 msgid "Settings for the audio player and audio markers."
 msgstr "Nastavení pro přehrávání zvuků a zvukové značky."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:105
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Některá nastavení se projeví až po restartování JOSM."
@@ -6764,5 +7583,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:42
 msgid "Login name (e-mail) to the OSM account."
-msgstr ""
+msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
@@ -6778,5 +7597,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:47
 msgid "OSM username (e-mail)"
-msgstr ""
+msgstr "Uživatelské jméno (e-mail)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:49
@@ -6790,4 +7609,7 @@
 "URL.<br><b>Do not use a valuable Password.</b></html>"
 msgstr ""
+"<html>VAROVÁNÍ: Heslo je uloženo jako běžný text v konfiguračním souboru."
+"<br>Heslo je jako text přenášeno na server a je součástí URL."
+"<br><b>Nepoužívejte hesla která chcete utajit.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -6814,59 +7636,61 @@
 msgstr "Klávesová zkratka"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
 #, java-format
 msgid "Short Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
+msgstr "Krátká popiska: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
 #, java-format
 msgid "URL: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+msgstr "URL: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
 #, java-format
 msgid "Author: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:65
+msgstr "Autor: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
 #, java-format
 msgid "Webpage: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:67
+msgstr "Webová stránka: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75
 #, java-format
 msgid "Version: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:128
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:241
+msgstr "Verze: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:145
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:168
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:296
 msgid "Icon paths"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:194
+msgstr "Cesty k ikonám"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246
 msgid "Copy defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:198
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114
 msgid "Please select the row to copy."
 msgstr "Vyberte řádek ke zkopírování."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:221
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276
 #, java-format
 msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:222
+msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277
 msgid "Add a new XML source to the list."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:223
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+msgstr "Pridat do seznamu nový XML zdroj."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:278
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 msgid "Delete the selected source from the list."
 msgstr "Smazat vybraný zdroj ze seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284
 msgid "Defaults (See tooltip for detailed information)"
 msgstr ""
@@ -7034,33 +7858,33 @@
 msgstr "Skupiny modifikátorů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:388
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414
 msgid "More information about this feature"
 msgstr "Více informací o tomto přednastavení"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:405
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432
 msgid "Optional Attributes:"
 msgstr "Volitelné atributy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:451
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478
 #, java-format
 msgid "Use preset ''{0}'' of group ''{1}''"
 msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:479
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Použít přednastavení \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
 msgid "closedway"
 msgstr "uzavřená cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:495
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:570
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
@@ -7071,15 +7895,15 @@
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:598
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekty typu {0} nejsou podporovány."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:627
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -7090,18 +7914,18 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:630
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756
 msgid "Change Properties"
 msgstr "Změnit vlastnosti"
@@ -7112,33 +7936,36 @@
 msgstr "Skupina přednastavení ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:64
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:37
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:136
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:59
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
 msgid "Contacting OSM Server..."
 msgstr "Kontaktuji OSM server..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:51
 #, java-format
 msgid "Downloading points {0} to {1}..."
 msgstr "Stahuji body {0} až {1}..."
 
-#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345
-#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33
-#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
-msgid "Downloading OSM data..."
-msgstr "Stahuji OSM data..."
-
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
 msgid "NullPointerException, possibly some missing tags."
 msgstr "NullPointerException, pravděpodobně chybí některé tagy."
 
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69
 msgid "Preparing data..."
 msgstr "Připravuji data..."
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:36
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Nemůžu číst \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
@@ -7146,24 +7973,24 @@
 msgstr "GPX soubory"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:124
 #, java-format
 msgid "Markers from {0}"
 msgstr "Značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39
 #, java-format
 msgid "File \"{0}\" does not exist"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
+msgstr "Soubor \"{0}\" neexistuje"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42
 #, java-format
 msgid "Parsing file \"{0}\" failed"
-msgstr ""
+msgstr "Parsování souboru \"{0}\" selhalo"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
@@ -7175,11 +8002,31 @@
 msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
+"v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:342
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
+#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:97
+msgid "Downloading OSM data..."
+msgstr "Stahuji OSM data..."
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
+#, java-format
+msgid "Fetching {0} with id {1} from ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:371
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+msgstr "Pro id {0} server odpověděl kódem 404. Přeskakuji."
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:399
+#, java-format
+msgid "Fetching a package of {0} from ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:408
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -7187,48 +8034,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
 msgid "NMEA-0183 Files"
 msgstr "NMEA-0183 soubory"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
 msgid "Coordinates imported: "
 msgstr "Importované souřadnice: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
 msgid "Malformed sentences: "
 msgstr "Poškozené věty: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
 msgid "Checksum errors: "
 msgstr "Chyby v kontrolním součtu: "
 
-#. don't scare the user unneccessarily
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
 msgid "Unknown sentences: "
 msgstr "Neznámé věty: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
 msgid "Zero coordinates: "
 msgstr "Nulové souřadnice: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
 msgid "NMEA import success"
 msgstr "NMEA import úspěšný"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:51
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
 msgid "NMEA import faliure!"
 msgstr "NMEA import selhal!"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
 #, java-format
 msgid "preference ''{0}'' missing. Can't initialize OsmApi"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
 msgid "This version of JOSM is incompatible with the configured server."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
+msgstr "Tato verze JOSM není kompatibilní s nakonfigurovaným serverem."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173
 #, java-format
 msgid ""
@@ -7236,16 +8082,18 @@
 "{0} to {1}."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:176
+"Podporuje protokol verzí 0.5 a 0.6, přičemž server hlásí podporu od {0} do "
+"{1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177
 #, java-format
 msgid "Communications with {0} established using protocol version {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:236
+msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
 #, java-format
 msgid ""
@@ -7253,43 +8101,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286
 msgid "Opening changeset..."
 msgstr "Otevírám sadu změn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305
 msgid "Closing changeset..."
 msgstr "Zavírám sadu změn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334
 msgid "Preparing..."
 msgstr "Připravuji..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339
 msgid "Uploading..."
 msgstr "Nahrávám..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361
+msgid "Waiting 10 seconds ... "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369
+msgid "OK - trying again."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
+#, fuzzy, java-format
+msgid "Starting retry {0} of {1}."
+msgstr "Prohledávám adresář {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:91
 #, java-format
 msgid "(Code={0})"
-msgstr ""
+msgstr "(Kód={0})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:93
 #, java-format
 msgid "The server replied an error with code {0}"
-msgstr ""
+msgstr "Server odpověděl chybou s kódem {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
 msgid "OSM Server Files bzip2 compressed"
-msgstr ""
+msgstr "OSM soubory komprimované pomocí bzip2"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:31
 msgid "Invalid bz2 file."
-msgstr ""
+msgstr "poškozený bz2 soubor."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:73
@@ -7313,12 +8174,7 @@
 msgstr "Přihlásit se"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:128
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:373
-msgid "Aborting..."
-msgstr "Přerušuji..."
-
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
 msgid "OSM Server Files gzip compressed"
-msgstr ""
+msgstr "OSM soubory komprimované pomocí gzip"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
@@ -7328,5 +8184,5 @@
 #, java-format
 msgid "mandatory attribute ''{0}'' missing"
-msgstr ""
+msgstr "povinný atribut ''{0}'' chybí"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
@@ -7334,4 +8190,5 @@
 msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
 msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu long , zadáno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
@@ -7340,9 +8197,10 @@
 "illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
 msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu long (>=0), zadáno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
 msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-msgstr ""
+msgstr "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
@@ -7351,4 +8209,5 @@
 "illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
 msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
@@ -7357,4 +8216,5 @@
 "illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
 msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu boolean, zadáno ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
@@ -7364,4 +8224,10 @@
 "''{1}''"
 msgstr ""
+"nedovolená hodnota povinného atributu ''{0}'' typu OsmPrimitiveType, zadáno "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:214
+msgid "Parsing OSM history data ..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
@@ -7369,109 +8235,130 @@
 msgstr "Chyba během parsování"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
 msgid "OSM Server Files"
 msgstr "Soubory z OSM serveru"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
 msgid "Unknown version"
 msgstr "Neznámá verze"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:150
 msgid "Version number missing from OSM data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+msgstr "V OSM datech chybí číslo verze"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:152
 #, java-format
 msgid "Unknown version: {0}"
 msgstr "Neznámá verze: {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:188
 msgid "Found <nd> element in non-way."
 msgstr "Nalezen element <nd> mimo cestu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:213
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:191
 msgid "<nd> has zero ref"
 msgstr "<nd> má nulový ref"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:225
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:203
 msgid "Found <member> element in non-relation."
 msgstr "Nalezen <member> tag mimo relaci."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:230
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
 #, java-format
 msgid "Missing attribute \"ref\" on member in relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:234
+msgstr "Chybí atribut \"ref\" člena relace {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
 #, java-format
 msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
+msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:216
 #, java-format
 msgid "Missing attribute \"type\" on member {0} in relation {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:240
+msgstr "Chybí atribut \"type\" člena {0} relace {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:218
 #, java-format
 msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletní <member> specifikace s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 msgid "Illegal object with id=0"
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:318
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
 #, java-format
 msgid ""
 "Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324
+"Neplatná hodnota atributu \"version\" v OSM prvku s  id {0}, zadáno {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:302
 #, java-format
 msgid "Missing attribute \"version\" on OSM primitive with id {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+msgstr "Chybí atribut \"version\" v OSM prvku s id {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:317
 #, java-format
 msgid "Missing required attribute \"{0}\"."
 msgstr "Chybí povinný atribut \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:359
-#, java-format
-msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:489
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#, java-format
+msgid ""
+"marked way {0} with {1} nodes incomplete because at least one node was "
+"missing in the loaded data and is therefore incomplete too"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:465
 msgid "Prepare OSM data..."
 msgstr "Připravuji OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:501
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:478
 msgid "Ill-formed node id"
 msgstr "Neplatné id uzlu"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:39
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
+#, java-format
+msgid "id parameter ''{0}'' > 0 required. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:72
+#, java-format
+msgid "parameter ''{0}'' > 0 required. Got {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:144
+msgid "Downloading referring ways ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:181
+msgid "Downloading referring relations ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
 msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
+msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:67
 msgid "Downloading history..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
+msgstr "Stahování historie..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
 msgid "Contacting Server..."
 msgstr "Kontaktuji server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:58
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
 #, java-format
 msgid "Failed to open connection to API {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgstr "Nepodařilo se navázat spojení s API {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -7480,5 +8367,18 @@
 "internetu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
+msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:118
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
+#, java-format
+msgid ""
+"Failed to close changeset {0}, will be closed by server after timeout. "
+"Exception was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:172
 #, java-format
 msgid ""
@@ -7487,16 +8387,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
-#, java-format
-msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
-msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})"
-
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:83
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "Update Plugins"
 msgstr "Aktualizuj pluginy"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:118
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
 msgid "Download Plugins"
 msgstr "Stáhnout pluginy"
@@ -7513,32 +8408,33 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:57
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
 msgid_plural "{0} Plugins successfully downloaded. Please restart JOSM."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:68
+msgstr[0] "{0} Plugin byl úspěšně stažen. Prosím restartujte JOSM."
+msgstr[1] "{0} Pluginy byly úspěšně staženy. Prosím restartujte JOSM."
+msgstr[2] "{0} Pluginů bylo úspěšně staženo. Prosím restartujte JOSM."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:116
+msgstr "Stahuji Plugin {0}..."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
 msgid "Skip download"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:117
+msgstr "Přeskočit stahování"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+msgstr "Pro plugin {1} je třeba JOSM verze {0}."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128
 msgid "Download Plugin"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:118
+msgstr "Stáhnout Plugin"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128
 msgid "Skip Download"
-msgstr ""
+msgstr "Přeskočit stahování"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -7547,34 +8443,32 @@
 msgstr "Nastala chyba v pluginu {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:65
-#, java-format
-msgid ""
-"Warning - loading of {0} plugin was requested. This plugin is no longer "
-"required."
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
+#, fuzzy, java-format
+msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 "Upozornění - bylo vyžádáno nahrání pluginu {0}. Tento plugin už není "
 "potřebný."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:79
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:94
+msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109
 #, java-format
 msgid "Plugin {0} is required by plugin {1} but was not found."
 msgstr "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Následující plugin nenalezen:{0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
 #, java-format
 msgid "Last plugin update more than {0} days ago."
 msgstr "Pluginy byly  naposledy aktualizovány před {0} dny."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:119
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:143
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -7584,21 +8478,21 @@
 "'pluginmanager.warntime'.)"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:147
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:245
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:255
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 msgid "Disable plugin"
 msgstr "Zakázat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:148
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
 #, java-format
 msgid "Could not load plugin {0}. Delete from preferences?"
 msgstr "Nemohu nahrát plugin {0}. Odstranit z nastavení?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:149
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:178
 msgid "Keep plugin"
 msgstr "Ponechat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:189
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -7608,5 +8502,5 @@
 "jejich přepsání."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:246
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283
 #, java-format
 msgid ""
@@ -7615,10 +8509,10 @@
 "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:249
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
 #, java-format
 msgid "According to the information within the plugin, the author is {0}."
 msgstr "Dle informací z pluginu je autor {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:252
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:289
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -7626,9 +8520,9 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:254
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
 msgid "Should the plugin be disabled?"
 msgstr "Chcete plugin zakázat ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:268
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -7638,27 +8532,23 @@
 "programu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:271
-msgid ""
-"The plugin could not be removed. Please tell the people you got JOSM from "
-"about the problem."
-msgstr ""
-"Plugin nebylo možné odstranit. Prosíme informujte o tomto problému vývojáře "
-"JOSM."
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
-#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:37
-msgid "Information"
-msgstr "Informace"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:167
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+msgid "The plugin could not be removed. Probably it was already disabled"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
+#, fuzzy
+msgid "Plugin information"
+msgstr "Nenalezeny informace o pluginu"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
 msgstr "není zádný popis"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:169
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
 msgid "More details"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+msgstr "Více detailů"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -7668,13 +8558,18 @@
 msgstr[2] "Informace o pluginech staženy z {0} sití"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
 msgid "No plugin information found."
 msgstr "Nenalezeny informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:77
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+#, java-format
+msgid "Plug-in named {0} is not available. Update skipped."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
 msgid "All installed plugins are up to date."
 msgstr "Všechny nainstalované pluginy jsou aktuální."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102
 #, java-format
 msgid ""
@@ -7687,9 +8582,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:116
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137
 msgid "Download missing plugins"
 msgstr "Stáhnout chybějící pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
 #, java-format
 msgid ""
@@ -7702,57 +8597,35 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:169
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:180
-#: build/trans_presets.java:320 build/trans_presets.java:321
-#: build/trans_presets.java:322 build/trans_presets.java:323
-#: build/trans_presets.java:324 build/trans_presets.java:325
-#: build/trans_presets.java:326 build/trans_presets.java:327
-#: build/trans_presets.java:328 build/trans_presets.java:329
-#: build/trans_presets.java:330 build/trans_presets.java:524
-#: build/trans_presets.java:525 build/trans_presets.java:526
-#: build/trans_presets.java:545 build/trans_presets.java:546
-#: build/trans_presets.java:547 build/trans_presets.java:566
-#: build/trans_presets.java:567 build/trans_presets.java:568
-#: build/trans_presets.java:587 build/trans_presets.java:588
-#: build/trans_presets.java:589 build/trans_presets.java:608
-#: build/trans_presets.java:609 build/trans_presets.java:610
-#: build/trans_presets.java:629 build/trans_presets.java:630
-#: build/trans_presets.java:631 build/trans_presets.java:766
-#: build/trans_presets.java:781 build/trans_presets.java:1314
-#: build/trans_presets.java:1376
-msgid "unknown"
-msgstr "neznámý"
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:185
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Verze {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:193
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin zahrnut v JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:319
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354
 #, java-format
 msgid "Error reading plugin information file: {0}"
 msgstr "Chyba čtení souboru informací o pluginu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:302
 msgid "This is after the end of the recording"
 msgstr "Toto je až za koncem nahrávky"
 
-#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:344
 msgid "Error playing sound"
 msgstr "Chyba přehrávání zvuku"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Do nothing"
 msgstr "Nedělat nic"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid "Report Bug"
 msgstr "Nahlásit chybu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:52
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
 msgid ""
 "An unexpected exception occurred.\n"
@@ -7766,18 +8639,18 @@
 "verzi JOSM, buďte tak laskavi a chybu nahlašte."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58
 msgid "Unexpected Exception"
 msgstr "Neočekávaná výjimka"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 #, java-format
 msgid "Please report a ticket at {0}"
 msgstr "Prosíme oznamte chybu na {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:67
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
 msgid "Include your steps to get to the error (as detailed as possible)!"
 msgstr "Popište (detailně) kroky, které vedly k chybě."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -7786,17 +8659,33 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
 msgid "Be sure to include the following information:"
 msgstr "Prosíme, připojte následující informace:"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:74
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:77
 msgid "(The text has already been copied to your clipboard.)"
 msgstr "(Text již byl zkopírován do schránky.)"
 
-#: ../core/src/org/openstreetmap/josm/tools/DontShowAgainInfo.java:32
-msgid "Do not show again"
-msgstr "Znovu nezobrazovat"
-
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:440
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:119
+#, java-format
+msgid "Unable to find translation for the locale {0}. Reverting to {1}."
+msgstr "Nelze najít překlad pro jazyk {0}. Vracím se k {1}."
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:167
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:181
+#, java-format
+msgid ""
+"Warning: failed to acccess directory ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201
+#, java-format
+msgid ""
+"Fatal: failed to locate image ''{0}''. This is a serious configuration "
+"problem. JOSM will stop working."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
 #, java-format
 msgid ""
@@ -7809,5 +8698,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:445
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452
 msgid ""
 "This action will have no shortcut.\n"
@@ -7817,5 +8706,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454
 #, java-format
 msgid ""
@@ -7826,13 +8715,28 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:449
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: Klávesové zkratky lze změnit v nastavení.)"
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:57
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:76
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:88
+#, java-format
+msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:61
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:81
+#, java-format
+msgid ""
+"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr ""
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid "Create grid of ways"
 msgstr "Vytvořit mřížku cest"
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:33
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 msgid ""
 "Forms a grid of ways in base to two existing that have various nodes and one "
@@ -7840,21 +8744,21 @@
 msgstr ""
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:52
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53
 msgid "Select two ways with a node in common"
 msgstr "Vybrat svě cesty se společným bodem."
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:62
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63
 msgid "Select two ways with alone a node in common"
 msgstr "Vybrat dvě cesty a bod"
 
-#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:103
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104
 msgid "Create a grid of ways"
 msgstr "Vytvořit mřížku cest"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:74
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70
 msgid "Upload Trace"
 msgstr "Nahrát trasy"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:85
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -7862,74 +8766,75 @@
 msgstr "Nahrát trasy na server"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:98
 msgid "Public"
 msgstr "Veřejné"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:103
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:99
 msgid "Selected makes your trace public in openstreetmap.org"
 msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org"
 
 #. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
 #: build/trans_presets.java:3006
 msgid "Description"
 msgstr "Popis"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
 msgid "Please enter Description about your trace."
 msgstr "Prosím zadejte popis vaší trasy"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:109
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
 msgid "Please enter tags about your trace."
 msgstr "Prosím zadejte tagy o vaší trase"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:154
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:150
 #, java-format
 msgid "Selected track: {0}"
 msgstr "Zvolená trasa: {0}"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:177
+#. Set progress dialog to indeterminate while connecting
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:200
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196
 msgid "Upload cancelled"
 msgstr "Nahrávání přerušeno"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:210
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206
 msgid "Error while uploading"
 msgstr "Chyba při nahrávání na server"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260
 msgid "GPX upload was successful"
 msgstr "Nahrání GPX dat na server proběhlo úspěšně"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:262
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:261
 msgid "Upload failed. Server returned the following message: "
 msgstr "Nahrávání selhalo. Server vrátil následující chybu: "
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
 #, java-format
 msgid "Uploading GPX track: {0}% ({1} of {2})"
 msgstr "Nahrávám GPX trasu: {0}% ({1} z {2})"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:336
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:335
 msgid "No description provided. Please provide some description."
 msgstr "Není zadán žádný popisek. Prosíme, zadejte jej."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:339
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:361
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:338
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360
 msgid "No GPX layer selected. Cannot upload a trace."
 msgstr "Není vybrána GPX vrstva. Nelze nahrát trasu na server."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:342
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:341
 msgid "No username provided."
 msgstr "Není zadáno uživatelské jméno."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344
 msgid "No password provided."
 msgstr "Není zadáno heslo."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376
 msgid "Uploading GPX Track"
 msgstr "Nahrávám GPX trasu na server"
@@ -7963,5 +8868,5 @@
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:94
 msgid "Center view"
-msgstr ""
+msgstr "Centrovat pohled"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojDialog.java:102
@@ -7999,33 +8904,34 @@
 msgstr "Jeden z vybraných souborů je prázdný!"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:125
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:124
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:127
 msgid "Read photos..."
 msgstr "Načíst fotografie..."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:179
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:181
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemohu najít výchozí cesto pro adresář {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:191
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:193
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prohledávám adresář {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:196
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:198
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nalezen nulový soubor v adresáři {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:199
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:202
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba při získávání souborů z adresáře {0}\n"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:264
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:267
 msgid "Correlate to GPX"
 msgstr "Korelovat vůči GPX"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:283
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:286
 #, java-format
 msgid "{0} were found to be gps tagged."
@@ -8045,15 +8951,15 @@
 msgstr "Soubory GPX (*.gpx *.gpx.gz)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Soubor {0} je načten pod jménem \"{1}\""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:170
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba při parsování {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:210
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -8065,34 +8971,34 @@
 "pásmo<hr></html>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:228
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:243
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257
 msgid "Gps time (read from the above photo): "
 msgstr "Čas GPS (načten z předchozích fotografií): "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:255
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:269
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/rrrr hh:mm:ss]"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:263
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277
 msgid "I'm in the timezone of: "
 msgstr "Jsem v časovém pásmu: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:326
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:362
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376
 msgid "No date"
 msgstr "Žádné datum"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:335
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349
 msgid "Open an other photo"
 msgstr "Otevřít další fotografie"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:374
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronizovat čas z fotografie GPS přijímače"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:385
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:404
 msgid ""
 "Error while parsing the date.\n"
@@ -8102,69 +9008,69 @@
 "Prosíme, použijte požadvaný formát"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:387
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406
 msgid "Invalid date"
 msgstr "Neplatné datum"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:430
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449
 msgid "<No GPX track loaded yet>"
 msgstr "<Není nahraná GPX trasa>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:436
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455
 msgid "GPX track: "
 msgstr "GPX trasa: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:441
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460
 msgid "Open another GPX trace"
 msgstr "Otevřít jinou GPX trasu"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:457
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:479
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498
 msgid "Offset:"
 msgstr "Posun:"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:491
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
 msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 msgstr "<html>Mohu vyfotit můj GPS přijímač.<br>Může to pomoci?</html>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:508
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
 msgid "Update position for: "
 msgstr "Aktualizovat pozici pro: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:517
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536
 msgid "All images"
 msgstr "Všechny obrázky"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:527
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546
 msgid "Images with no exif position"
 msgstr "Obrázky bez exif pozice"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:537
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556
 msgid "Not yet tagged images"
 msgstr "Neotagované obrázky"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:557
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
 msgid "Correlate images with GPX track"
 msgstr "Korelovat obrázky s GPX trasou"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
 msgid "Correlate"
 msgstr "Korelovat"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:559
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
 msgid "Auto-Guess"
 msgstr "Auto-odhad"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:569
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
 msgid "You should select a GPX track"
 msgstr "Měli byste vybrat GPX trasu"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:570
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589
 msgid "No selected GPX track"
 msgstr "Není vybrána GPX trasa"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:582
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
 #, java-format
 msgid ""
@@ -8175,9 +9081,9 @@
 "Očekávaný formát: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:583
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602
 msgid "Invalid timezone"
 msgstr "Nepatné časové pásmo"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:595
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
 #, java-format
 msgid ""
@@ -8188,65 +9094,65 @@
 "Očekávaný formát: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:596
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615
 msgid "Invalid offset"
 msgstr "Neplatný posun"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:639
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
 #, java-format
 msgid "Found {0} matches of {1} in GPX track {2}"
 msgstr "Nalezeno {0} shod s {1} v GPX trase {2}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:640
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:659
 msgid "GPX Track loaded"
 msgstr "Nahrána GPX trasa"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:675
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
 msgid "The selected photos don't contain time information."
 msgstr "Zvolené fotografie neobsahují informace o čase."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:676
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:695
 msgid "Photos don't contain time information"
 msgstr "Fotografie neobsahují informace o čase"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:713
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730
 msgid ""
 "The selected GPX track doesn't contain timestamps. Please select another one."
 msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:714
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:731
 msgid "GPX Track has no time information"
 msgstr "GPX trasa neobsahuje časové údaje"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:759
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časová zóna: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:760
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuty: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:761
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekundy: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795
 #, java-format
 msgid "Matched {0} of {1} photos to GPX track."
 msgstr "{0} z {1} fotografií bylo dosazeno do GPX trasy."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:781
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:798
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Časový rozdíl {0} dnů)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:788
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805
 #, java-format
 msgid "Offset between track and photos: {0}m {1}s"
 msgstr "Posun mezi trasou a fotografiemi: {0}m {1}s"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:850
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -8254,13 +9160,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:852
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
 msgid "Matching photos to track failed"
 msgstr "Dosazení fotografií do trasy selhalo."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:868
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
 msgid "Adjust timezone and offset"
 msgstr "Upravit časovou zónu a posun"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:870
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
 msgid "Default Values"
 msgstr "Výchozí hodnoty"
@@ -8282,5 +9188,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:357
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
@@ -8303,6 +9209,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:43
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:209
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:165
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:166
 msgid "CadastreGrabber: Illegal url."
 msgstr "CadastreGrabber: Neplatné URL."
@@ -8476,22 +9382,22 @@
 msgstr "Přidat \"source=...\" k objektům?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:44
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:48
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:45
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:49
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:21
 #, java-format
 msgid "Downloading {0}"
 msgstr "Stahuji {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:52
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:56
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:53
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:57
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSTask.java:29
 msgid "Contacting WMS Server..."
 msgstr "Kontaktuji WMS server..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:158
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:159
 msgid "Create buildings"
 msgstr "Vytvořit budovy"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:264
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:265
 msgid ""
 "To avoid cadastre WMS overload,\n"
@@ -8499,18 +9405,18 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:270
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:216
 msgid "Please, enable auto-sourcing and check cadastre millesime."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:63
 msgid "Extract SVG ViewBox..."
 msgstr "Extrahovat SVG ViewBox..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:67
 msgid "Extract best fitting boundary..."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:127
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:128
 msgid "Create boundary"
 msgstr "Vytvořit hranice"
@@ -8532,5 +9438,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
 msgid "Download Image from French Cadastre WMS"
-msgstr ""
+msgstr "Stáhnout obráze z Francouzkého katastrálního WMS"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:23
@@ -8553,5 +9459,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:19
 msgid "Load location from cache (only if cache is enabled)"
-msgstr ""
+msgstr "Načíst lokaci z cache (pouze pokud je cache povolena)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
@@ -8580,4 +9486,6 @@
 "known by www.cadastre.gouv.fr .</html>"
 msgstr ""
+"<html>Vložte název města nebo obce.<br>Použijte syntax a interpunkci dle www."
+"cadastre.gouv.fr .</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
@@ -8622,8 +9530,10 @@
 "Select one of them first, then retry"
 msgstr ""
+"Je zobrazena více než jedna WMS vrstva\n"
+"Nejdříve vyberte jednu z nich a potom zopakujte"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Blank Layer"
 msgstr "Prázdná vrstva"
@@ -8652,5 +9562,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:401
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:384
 #, java-format
 msgid ""
@@ -8661,14 +9571,14 @@
 "Vytvořte nový soubor."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:385
 msgid "Cache Format Error"
 msgstr "Chyba formátu cache"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:417
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:400
 #, java-format
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:402
 msgid "Cache Lambert Zone Error"
 msgstr "Chyba Lambertovy zóny v cache"
@@ -8710,9 +9620,9 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 msgid "Split area"
-msgstr ""
+msgstr "Rozdělit oblast"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
 msgid "Splits an area by an untagged way."
-msgstr ""
+msgstr "Rozdělit oblast pomocí neotagované cesty"
 
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:76
@@ -8722,24 +9632,26 @@
 "Remove the area from the relation before splitting it."
 msgstr ""
+"Zvolená oblast nemůže být rozdělena, protože je členem relace.\n"
+"Odstraňte oblast z relace před rozdělením."
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
 msgid "TangoGPS Files (*.log)"
-msgstr ""
+msgstr "Soubory TangoGPS (*.log)"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
 msgid "Format errors: "
-msgstr ""
+msgstr "Chyby fomátu: "
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
 msgid "TangoGPS import success"
-msgstr ""
+msgstr "Import TangoGPS úspěšný"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
 msgid "TangoGPS import faliure!"
-msgstr ""
+msgstr "Import TangoGPS selhal!"
 
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:65
 msgid "TCX Files (*.tcx)"
-msgstr ""
+msgstr "TCX Soubory (*.tcx)"
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
@@ -8756,4 +9668,9 @@
 msgstr "Vytvořit duplikát cesty"
 
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:65
+msgid "No data loaded."
+msgstr "Nebyla načtena žádná data."
+
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
 msgid "You must select at least one way."
@@ -8764,11 +9681,11 @@
 msgstr "Vytvořit duplikát cesty"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:93
 msgid "Layer for editing GPX tracks"
 msgstr "Vrstva pro editaci GPX tras"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:215
 msgid "Convert to GPX layer with anonymised time"
-msgstr ""
+msgstr "Konvertovat do GPX vrstvy s anonymizací času"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46
@@ -8778,5 +9695,5 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
 msgid "EditGpx"
-msgstr ""
+msgstr "UpravitGpx"
 
 #. TODO what is icon at the end?
@@ -8851,5 +9768,5 @@
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
 msgid "Unknown logFormat"
-msgstr ""
+msgstr "Neznámý formát logu"
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
@@ -8887,30 +9804,30 @@
 msgstr "smazat data po importu"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:43
 msgid "Importing data from device."
 msgstr "Importovat data ze zařízení."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:54
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:48
 msgid "Importing data from DG100..."
 msgstr "Importuji data z DG100..."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:62
 msgid "Error deleting data."
 msgstr "Chyb při mazání dat."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:74
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:68
 #, java-format
 msgid "imported data from {0}"
 msgstr "importovaná data z {0}"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:71
 msgid "No data found on device."
 msgstr "Nenalezena žádná data na zařízení."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:82
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:76
 msgid "Connection failed."
 msgstr "Spojení selhalo."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:101
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:95
 msgid ""
 "Cannot load library rxtxSerial. If you need support to install it try "
@@ -8922,14 +9839,14 @@
 "import-plugin/"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:111
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:105
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 msgid "Globalsat Import"
 msgstr "Globalsat Import"
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:112
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:106
 msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
 msgstr "Importovat data z Globalsat Datalogger DG100 do GPX vrstvy."
 
-#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:119
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
 msgid "Import"
 msgstr "Import"
@@ -8945,5 +9862,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 msgid "World"
-msgstr ""
+msgstr "Svět"
 
 #: ../plugins/grid/src/grid/GridLayer.java:200
@@ -8953,5 +9870,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:222
 msgid "Grid layer:"
-msgstr ""
+msgstr "Vrstva mřížky:"
 
 #: ../plugins/grid/src/grid/GridPlugin.java:27
@@ -9020,40 +9937,40 @@
 msgstr "Otevře obrázek s ImageWayPoint"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:108
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
 msgid "The starting location was not within the bbox"
 msgstr "Počáteční poloha se nachází mimo bbox"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:113
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
 msgid "Looking for shoreline..."
 msgstr "Hledám pobřeží..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:145
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
 #, java-format
 msgid "{0} nodes so far..."
 msgstr "Zatím {0} uzlů..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:51
 msgid "Lake Walker."
 msgstr "Lake Walker."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:17
 msgid "Lake Walker"
 msgstr "Lake Walker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:119
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:118
 #, java-format
 msgid "Error creating cache directory: {0}"
 msgstr "Chyba při vytváření cache adresáře: {0}"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:152
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:151
 msgid "Tracing"
 msgstr "Stopování"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:154
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:153
 msgid "checking cache..."
 msgstr "kontroluji cache..."
@@ -9062,26 +9979,18 @@
 #. * Run the nodelist through a vertex reduction algorithm
 #.
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:190
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:193
 msgid "Running vertex reduction..."
 msgstr "Spouštím redukci vertexů..."
 
-#. System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
-#. *
-#. * And then through douglas-peucker approximation
-#.
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:200
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:204
 msgid "Running Douglas-Peucker approximation..."
 msgstr "Spouštím aproximaci Douglas-Peucker..."
 
-#. System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
-#. *
-#. * And then through a duplicate node remover
-#.
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:215
 msgid "Removing duplicate nodes..."
 msgstr "Odstraňuji duplicitní uzly..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:112
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:291
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
 msgid "Lakewalker trace"
 msgstr "Lakewalker trasování"
@@ -9089,5 +9998,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
 msgid "An unknown error has occurred"
-msgstr ""
+msgstr "Došlo k neznámé chybě"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
@@ -9166,7 +10075,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_style.java:963 build/trans_style.java:980
-#: build/trans_style.java:996 build/trans_style.java:3355
-#: build/trans_style.java:3363
+#: build/trans_style.java:968 build/trans_style.java:985
+#: build/trans_style.java:1001 build/trans_style.java:3360
+#: build/trans_style.java:3368
 msgid "water"
 msgstr "voda"
@@ -9288,5 +10197,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Direction to search for land. Default east."
-msgstr ""
+msgstr "Směr hledání země. Standardně východ."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
@@ -9323,9 +10232,9 @@
 msgstr "Nastavení  pluginu Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
 msgid "Downloading image tile..."
 msgstr "Stahuji dlaždici..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:148
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
 msgid "Could not acquire image"
 msgstr "Nemohu získat obrázek"
@@ -9383,5 +10292,5 @@
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:68
 msgid "Capture GPS Track"
-msgstr ""
+msgstr "Nahrát GPS záznam"
 
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:41
@@ -9481,8 +10390,11 @@
 "new server? (Strongly recommended)</html>"
 msgstr ""
+"<html>Plugin openstreetbus používá starý server na appspot.com.<br>Nový "
+"server je dostupný na schokokeks.org.<br>Chcete změnit nastavení serveru na "
+"nový? (Velice doporučujeme)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
 msgid "Switch to new openstreetbugs server?"
-msgstr ""
+msgstr "Přepnout na nový openstreetbugs server?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
@@ -9516,5 +10428,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:97
 msgid "Opens the OpenStreetBugs window and activates the automatic download"
-msgstr ""
+msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:125
@@ -9548,4 +10460,6 @@
 "comment:</html>"
 msgstr ""
+"<html>Opravdu označit tuto chybu ''vyřešeno''?<br><br>Můžete přidat "
+"volitelný komentář:</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:64
@@ -9569,18 +10483,18 @@
 msgstr "Neznámý stav problému"
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:45
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
 msgid "Open Visible..."
 msgstr "Otevřít viditelné..."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:47
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:46
 msgid "Open only files that are visible in current view."
 msgstr "Otevřít pouze soubory, které jsou viditelné v tomto pohledu."
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:57
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:56
 msgid "No view open - cannot determine boundaries!"
 msgstr ""
 
-#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:110
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:109
 #, java-format
 msgid "Unknown file extension: {0}"
@@ -9607,33 +10521,33 @@
 msgstr "Spustitelný soubor Firefoxu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:24
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
 msgid "load data from API"
 msgstr "nahrání dat z API"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:25
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
 msgid "change the selection"
 msgstr "změna výběru"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:26
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
 msgid "change the viewport"
 msgstr "změna pohledu"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
 msgid "confirm all Remote Control actions manually"
 msgstr "potvrzovat ručně všechny akce Dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
 msgid "A plugin that allows JOSM to be controlled from other applications."
 msgstr "Plugin umožňující ovládání JOSM z jiných aplikací."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "Remote Control"
 msgstr "Dálkové ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:32
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:34
 msgid "Settings for the Remote Control plugin."
 msgstr "Nastavení pro plugin \"Remote Control\""
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:33
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid ""
 "The Remote Control plugin will always listen on port 8111 on localhost.The "
@@ -9645,28 +10559,28 @@
 "využívající tento plugin."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:38
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:40
 msgid "Permitted actions"
 msgstr "Povolené akce"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:115
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:121
 msgid "Remote Control has been asked to load data from the API."
 msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API."
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
 #, java-format
 msgid "Request details: {0}"
 msgstr "Detaily požadavku: {0}"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:116
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:213
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:122
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:219
 msgid "Do you want to allow this?"
 msgstr "Chcete toto povolit?"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:117
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:214
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:123
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:220
 msgid "Confirm Remote Control action"
 msgstr "Potvrdit akci dálkového ovládání"
 
-#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:211
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:217
 msgid "Remote Control has been asked to import data from the following URL:"
 msgstr "Dálkové ovládání bylo požádáno o import dat z následujícího URL:"
@@ -9675,13 +10589,13 @@
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
 msgid "Edit relation"
-msgstr ""
+msgstr "Upravit relaci"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 msgid "Edit relations"
-msgstr ""
+msgstr "Upravit relace"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:72
 msgid "No relation is selected"
-msgstr ""
+msgstr "Nevybrána žádná relace"
 
 #. Add menu
@@ -9695,5 +10609,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
 msgid "Routing"
-msgstr ""
+msgstr "Navigace"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
@@ -9711,17 +10625,17 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
 msgid "Open a list of routing nodes"
-msgstr ""
+msgstr "Otevřít seznam navigačních bodů"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
 msgid "Add routing layer"
-msgstr ""
+msgstr "Přidat navigační vrstvu"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:88
 msgid "Criteria"
-msgstr ""
+msgstr "Kritérium"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
 msgid "Shortest"
-msgstr ""
+msgstr "Nejkratší"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:113
@@ -9795,5 +10709,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:516
 msgid "image "
-msgstr ""
+msgstr "obrázek "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
@@ -9933,4 +10847,26 @@
 msgstr "Výška"
 
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#, java-format
+msgid "Updating properties of up to {0} object"
+msgid_plural "Updating properties of up to {0} objects"
+msgstr[0] "Upravit vlastnosti {0} objektů"
+msgstr[1] "Upravit vlastnosti {0} objektu"
+msgstr[2] "Upravit vlastnosti {0} objektů"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
+msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
+msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
+msgstr ""
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
+msgid ""
+"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+"found."
+msgstr ""
+
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -9955,5 +10891,5 @@
 #, java-format
 msgid "unexpected column number {0}"
-msgstr ""
+msgstr "neočekávané číslo sloupce {0}"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -10126,5 +11062,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203
 msgid "Added node on all intersections"
-msgstr ""
+msgstr "Přidány body na všechny průsečíky"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:227
@@ -10138,9 +11074,9 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
 msgid "Joined self-overlapping area"
-msgstr ""
+msgstr "Spojena plocha překrývající sama sebe"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238
 msgid "Joined overlapping areas"
-msgstr ""
+msgstr "Spojeny překrývající se plochy"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:242
@@ -10158,21 +11094,21 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465
 msgid "Removed Element from Relations"
-msgstr ""
+msgstr "Prvek odstraněn z relací"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
+msgstr "Spojit plochy: Vymazat krátké cesty"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590
 msgid "Closed Way"
-msgstr ""
+msgstr "Uzavřená cesta"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857
 msgid "Remove tags from inner ways"
-msgstr ""
+msgstr "Odstranit tagy z vnitřních cest"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886
 msgid "Join Areas Function"
-msgstr ""
+msgstr "Funkce spojení ploch"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31
@@ -10184,33 +11120,33 @@
 msgstr "Otevře dialog umožňující skočit na zadané místo"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Zadejte šířku/délku místa kam skočit."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
 msgid "You can also paste an URL from www.openstreetmap.org"
 msgstr "Můžete též vložit URL z www.openstreetmap.org"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
 msgid "Zoom (in metres)"
 msgstr "Přiblížení (v metrech)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
 msgid "Jump there"
 msgstr "Skočit tam"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
 msgid "Jump to Position"
 msgstr "Skok na místo"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
 msgid "Could not parse Latitude, Longitude or Zoom. Please check."
 msgstr "Nelze rozpoznat šířku, délku nebo přiblížení. Prosím, zkontrolujte."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
 msgid "Unable to parse Lon/Lat"
 msgstr "Nelze rozpoznat šířku/délku"
@@ -10243,6 +11179,6 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:35
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75
 msgid "Validation errors"
 msgstr "Chyby kontroly"
@@ -10252,10 +11188,10 @@
 msgstr "Žádné chyby při kontrole"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:163
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164
 msgid "Grid"
 msgstr "Mřížka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
 #, java-format
 msgid ""
@@ -10344,23 +11280,15 @@
 msgstr "Provede kontrolu dat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
 msgid "Data with errors. Upload anyway?"
 msgstr "Data mají chyby. Přesto nahrát?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
 msgid "Open the validation window."
 msgstr "Otevřít okno s výsledkem kontroly."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:80
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81
 msgid "Zoom to problem"
 msgstr "Přiblížit na problém"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
-msgid "Validate"
-msgstr "Ověřit"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:101
-msgid "Validate either current selection or complete dataset."
-msgstr "Ověřit buď aktuální výběr, nebo kompletní data."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
@@ -10433,22 +11361,22 @@
 msgstr "Zkřížené cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:32
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:50
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
 msgid "Duplicated nodes"
 msgstr "Duplicitní uzly"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:33
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:36
 msgid "This test checks that there are no nodes at the very same location."
 msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:21
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
 msgid "Duplicated way nodes."
 msgstr "Duplikované uzly v cestě."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
 msgid "Checks for ways with identical consecutive nodes."
 msgstr "Zkontroluje cesty jestli neobsahují identické uzly za sebou."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36
 msgid "Duplicated way nodes"
 msgstr "Duplicitní uzly v cestě"
@@ -10525,23 +11453,23 @@
 msgstr "Tento test kontroluje cesty na podobnost jmen, kdy může jít o překlep."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 msgid "Properties checker :"
 msgstr "Kontrola vlastností :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
 msgid "This plugin checks for errors in property keys and values."
 msgstr "Tento plugin kontroluje chyby klíčů a jejich hodnot."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:282
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
 #, java-format
 msgid ""
@@ -10552,7 +11480,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:425
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:426
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:427
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
 msgid "Illegal tag/value combinations"
 msgstr "Neplatná kombinace klíče/hodnoty"
@@ -10560,78 +11488,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:448
 msgid "Painting problem"
 msgstr "Problém s vykreslováním"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Klíč ''{0}'' je neplatný."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
 msgid "Tags with empty values"
 msgstr "Klíče s prázdnými hodnotami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
 msgid "Invalid property key"
 msgstr "Neplatné klíče vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
 msgid "Invalid white space in property key"
 msgstr "Neplatná mezera v klíči vlastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:480
 msgid "Property values start or end with white space"
 msgstr "Hodnota začíná nebo končí mezerou"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:486
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Hodnota ''{0}'' pro klíč ''{1}'' není v přednastavení"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:537
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
 msgid "Check property keys."
 msgstr "Kontrola klíčů vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Kontroluje platnost klíčů vlastností proti seznamu slov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
 msgid "Use complex property checker."
 msgstr "Použít komplexní kontrolu vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
 msgid "Validate property values and tags using complex rules."
 msgstr "Kontroluje platnost hodnot a tagů pomocí komplexních pravidel."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:621
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:651
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:624
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:625
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:647
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -10639,82 +11569,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid "Add a new source to the list."
 msgstr "Přidat nový zdroj do seznamu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:674
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Edit the selected source."
 msgstr "Upravit zvolený zdroj."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692
 msgid "Data sources"
 msgstr "Zdroje dat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 msgid "Check property values."
 msgstr "Kontrola hodnot vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
 msgid "Validate that property values are valid checking against presets."
 msgstr "Kontroluje platnost hodnot vlastností proti přednastaveným hodnotám."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
 msgid "Check for FIXMES."
 msgstr "Zkontrolovat tagy s FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Najít cesty a body s FIXME v jakékoliv hodnotě vlastnosti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:714
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
 msgid "Use default data file."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+msgstr "Použít stadardní datový soubor."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
 msgid "Use the default data file (recommended)."
-msgstr ""
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
+msgstr "Použít standardní datový soubor (doporučeno)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:726
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:824
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839
 msgid "Fix properties"
 msgstr "Opravit vlastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:945
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960
 msgid "Could not find element type"
 msgstr "Nelze najít typ elementu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:962
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977
 msgid "Could not find warning level"
 msgstr "Nelze najít úroveň varování"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:971
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Neplatný výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:975
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -10861,7 +11791,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4090 build/trans_style.java:4097
-#: build/trans_style.java:4104 build/trans_style.java:4111
-#: build/trans_style.java:4118
+#: build/trans_style.java:4095 build/trans_style.java:4102
+#: build/trans_style.java:4109 build/trans_style.java:4116
+#: build/trans_style.java:4123
 msgid "building"
 msgstr "budova"
@@ -10875,5 +11805,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4125
+#: build/trans_style.java:4130
 msgid "area"
 msgstr "oblast"
@@ -10907,10 +11837,10 @@
 msgstr "Spojený koncový uzel cest poblíž jiné cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:34
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:88
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:90
 msgid "Untagged and unconnected nodes"
 msgstr "Neotagované a nespojené uzly."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:35
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
 msgid "This test checks for untagged nodes that are not part of any way."
 msgstr "Tento test hledá neotagované uzly, které nejsou součástí žádné cesty."
@@ -10964,8 +11894,32 @@
 msgstr "Obrácená země: země není na levé straně"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:74
 #, java-format
 msgid "{0}, ..."
 msgstr "{0}, ..."
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
+msgid "Scanned Map..."
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
+msgid ""
+"Display a map that was previously scanned and uploaded to walking-papers.org"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
+msgid ""
+"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
+#, java-format
+msgid "Could not read information from walking-papers.org the id \"{0}\""
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60
+#, java-format
+msgid "Walking Papers: {0}"
+msgstr ""
 
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:67
@@ -10976,10 +11930,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:146
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:153
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
 msgid "Reached a junction"
 msgstr ""
@@ -11023,4 +11977,26 @@
 "use."
 msgstr ""
+"Přidávat upravovat a mazat položky WMS pluginu můžete na záložce nastavení - "
+"položky se následně zobrazí v menu WMS.\n"
+"\n"
+"Totéž můžete také udělat v pokročilých volbách za použití následujícího "
+"schema:\n"
+"wmsplugin.url.1.name=Landsat\n"
+"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
+"wmsplugin.url.2.name=NPE Maps... atd\n"
+"\n"
+"Příklad kompletního URL WMS (landsat)\n"
+"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
+"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
+"\n"
+"Pro Metacarta§s Map Rectifier http://labs.metacarta.com/rectifier/ , "
+"potřebujete zadat pouze odpovídající 'id'.\n"
+"Pro přidání položky Metacarta Map Rectifier do menu vyvořte ručně URL jako v "
+"příkladu a 73 nahraďte id vašeho obrázku:\n"
+"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
+"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
+"\n"
+"Poznámka: Ujistěte se, že obrázek vyhovuje copyrightu (je volně šiřitelný), "
+"pokud si nejste jisti, nepoužívejte jej."
 
 #: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
@@ -11028,17 +12004,17 @@
 msgstr "Nápověda pluginu WMS Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
 msgid "Rectified Image..."
 msgstr "Zaměřený obrázek..."
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69
 msgid "Download Rectified Images From Various Services"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
 #, java-format
 msgid "WMS: {0}"
-msgstr ""
+msgstr "WMS: {0}"
 
 #. This service serves the purpose of "just this once" without forcing the user
@@ -11046,26 +12022,26 @@
 #. Clipboard content gets trimmed, so matching whitespace only ensures that this
 #. service will never be selected automatically.
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107
 msgid "Custom WMS Link"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
+msgstr "Vlastní WMS Link"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112
 msgid "Supported Rectifier Services:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
+msgstr "Podporované zdroje k překreslování:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136
 msgid "Visit Homepage"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
+msgstr "Navštívit domovskou stránku"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145
 msgid "WMS URL or Image ID:"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+msgstr "URL WMS nebo ID obrázku:"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 msgid "Add Rectified Image"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
 msgid ""
 "Couldn't match the entered link or id to the selected service. Please try "
@@ -11073,7 +12049,7 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200
 msgid "No valid WMS URL or id"
-msgstr ""
+msgstr "Neplatná URL WMS nebo id"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
@@ -11081,5 +12057,5 @@
 msgstr "Upravit pozici zvolené WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:127
 #, java-format
 msgid ""
@@ -11090,19 +12066,19 @@
 "Toto může vést ke špatným souřadnicím."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:58
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:59
 msgid "Automatic downloading"
 msgstr "Automatické stahování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:119
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:120
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), automatické stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:121
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:122
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
 msgstr "WMS vrstva ({0}), stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:165
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:168
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -11110,88 +12086,88 @@
 "Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:231
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:240
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:252
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:274
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:294
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:291
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:297
 msgid "Save WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+msgstr "Uložit WMS vrstvu"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:321
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:319
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:325
 msgid "Load WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+msgstr "Načíst vrstvu WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Nepodporovaná verze WMS souboru; nalezeno {0}, očekáváno {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:331
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:337
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:142
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:155
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
 msgid "Open a blank WMS layer to load data from a file"
 msgstr "K nahrání dat ze souboru otevřete nejprve prázdnou WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40
 msgid "WMS Plugin Preferences"
 msgstr "Nastavení pluginu WMS Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:39
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:72
+msgstr "Upravit seznam WMS serverů zobrazený v menu WMS pluginu"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
 msgid "Menu Name"
 msgstr "Jméno v menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:41
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:76
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54
 msgid "Menu Name (Default)"
 msgstr "Jméno v menu (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:53
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54
 msgid "WMS URL (Default)"
 msgstr "WMS URL (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82
 msgid "Enter a menu name and WMS URL"
 msgstr "Zadejte jméno v menu a WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
 msgid "Copy Default"
 msgstr "Zkopírovat výchozí"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:124
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135
 msgid "Downloader:"
 msgstr ""
@@ -11231,5 +12207,5 @@
 #: build/specialmessages.java:10
 msgid "Audio Device Unavailable"
-msgstr ""
+msgstr "Audio zařízení je nedostupné"
 
 #. Java message loading audio data
@@ -11273,10 +12249,10 @@
 msgid ""
 "Creating and handling address nodes and buildings within Czech Republic."
-msgstr ""
+msgstr "Vytváření a správa adresních bodů a budov v rámci  České Republiky."
 
 #. Plugin dataimport
 #: build/trans_plugins.java:13
 msgid "Allows to import various file formats into JOSM directly."
-msgstr ""
+msgstr "Umožňuje importovat rozličné formáty souborů přímo do JOSM."
 
 #. Plugin DirectUpload
@@ -11300,4 +12276,6 @@
 "very fast."
 msgstr ""
+"Umožňuje uživateli anonymizovat čas a velice rychle smazat části rozsáhlých "
+"GPX záznamů."
 
 #. Plugin globalsat
@@ -11306,11 +12284,16 @@
 msgstr "Stahuje GPS body z Globalsat dg100 data loggeru přímo do JOSM."
 
+#. Plugin graphview
+#: build/trans_plugins.java:23
+msgid "Visualizes routing information as a routing graph."
+msgstr ""
+
 #. Plugin grid
-#: build/trans_plugins.java:23
+#: build/trans_plugins.java:25
 msgid "Provide a background layer that displays a map grid"
-msgstr ""
+msgstr "Poskytuje vrstvu na pozadí zobrazující mřížku mapy"
 
 #. Plugin ImageWayPoint
-#: build/trans_plugins.java:25
+#: build/trans_plugins.java:27
 msgid ""
 "Another plugin to match images to the waypoints in a GPX file. A match is "
@@ -11320,5 +12303,5 @@
 
 #. Plugin lakewalker
-#: build/trans_plugins.java:27
+#: build/trans_plugins.java:29
 msgid "Helps vectorizing WMS images."
 msgstr ""
@@ -11327,5 +12310,5 @@
 
 #. Plugin livegps
-#: build/trans_plugins.java:29
+#: build/trans_plugins.java:31
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
@@ -11334,5 +12317,5 @@
 
 #. Plugin measurement
-#: build/trans_plugins.java:31
+#: build/trans_plugins.java:33
 msgid ""
 "Provide a measurement dialog and a layer to measure length and angle of "
@@ -11340,7 +12323,10 @@
 "paths (which also can be imported from a gps layer)."
 msgstr ""
+"Poskytuje měřící dialog a vrstvu pro měření délek a úhlů segmentů, ploch "
+"uzavřených jednoduchou cestou a vytváření měřících cest (které je možné "
+"importovat z gps vrstvy)."
 
 #. Plugin nearclick
-#: build/trans_plugins.java:33
+#: build/trans_plugins.java:35
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -11348,17 +12334,20 @@
 "mouse moving (general Java - tablet problem)."
 msgstr ""
+"Simuluje kliknutí pokud uděláte malý a krátký pohyb. Užitečné pro tablety, "
+"pokud máte problémy, stačí kliknout na tablet bez pohybu myší (obecný Java - "
+"tablet problém)."
 
 #. Plugin openlayers
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid "Displays an OpenLayers background image"
-msgstr ""
+msgstr "Zobrazuje na pozadí obrázek z OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje problémy z OpenStreetBugs."
 
 #. Plugin openvisible
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -11367,5 +12356,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -11374,51 +12363,57 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
 "align it with the map."
 msgstr ""
+"Tento plugin umožňuje zobrazit libovolný obrázek na pozadí editoru a "
+"ztotožnit jej s mapou."
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "Let other applications send commands to JOSM."
 msgstr "Umožní jiné aplikace posílat příkazy do JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
 "defined in routes.xml file in plugin directory"
 msgstr ""
+"Vykresluje cesty (autobusy, turistika, cyklistika, ...). Cesty musí být "
+"definovány v souboru routes.xml v adresáři pluginů."
 
 #. Plugin routing
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "Provides routing capabilities."
 msgstr "Poskytuje směrování"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
 "background and request updates."
 msgstr ""
+"Zobrazuje slippy map mřížku v JOSM. Můžete nahrát dlaždice ze slippy map "
+"jako pozadí a požadovat aktualizace."
 
 #. Plugin surveyor
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Umožní přidat ukazatele/body na současnou GPS polohu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Poskytuje dialog umožňující editovat tagy v tabulce."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -11428,10 +12423,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
 #. Plugin usertools
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -11442,5 +12437,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -11451,5 +12446,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -11459,11 +12454,18 @@
 "provádí opravy. Zahrnuje kontrolu překlepů pro tagy."
 
+#. Plugin walkingpapers
+#: build/trans_plugins.java:71
+msgid ""
+"Supports downloading tiled, scanned maps from walking-papers.org. This "
+"plugin is still under early development and may be buggy."
+msgstr ""
+
 #. Plugin waydownloader
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:73
 msgid "Easy downloading along a long set of interconnected ways"
-msgstr ""
+msgstr "Snadné stahovaní velmi dlouhých propojených cest"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:75
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -11932,5 +12934,5 @@
 #: build/trans_presets.java:145 build/trans_presets.java:161
 msgid "Motorroad"
-msgstr ""
+msgstr "Silnice pro motorová vozidla"
 
 #. item "Streets/Trunk" check "Embankment"
@@ -12619,58 +13621,6 @@
 
 #. item "Streets/Roundabout" combo "Type"
-#. color barrier
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="border_control"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="bump_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="sally_port"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="portcullis"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="spikes"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="bus_trap"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="drawbridge"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="barrier" v="hampshire_gate"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- highway tags -->
+#. color motorroad
+#. </rule>
 #.
 #. <rule>
@@ -12684,6 +13634,6 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:527
-#: build/trans_style.java:535
+#: build/trans_presets.java:346 build/trans_style.java:532
+#: build/trans_style.java:540
 msgid "motorway"
 msgstr "dálnice"
@@ -12709,6 +13659,6 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:543
-#: build/trans_style.java:551
+#: build/trans_presets.java:346 build/trans_style.java:548
+#: build/trans_style.java:556
 msgid "trunk"
 msgstr "4. pruhová silnice"
@@ -12734,6 +13684,6 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:559
-#: build/trans_style.java:567
+#: build/trans_presets.java:346 build/trans_style.java:564
+#: build/trans_style.java:572
 msgid "primary"
 msgstr "silnice první třídy"
@@ -12759,6 +13709,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:346 build/trans_style.java:575
-#: build/trans_style.java:583
+#: build/trans_presets.java:346 build/trans_style.java:580
+#: build/trans_style.java:588
 msgid "secondary"
 msgstr "silnice druhé třídy"
@@ -12772,5 +13722,5 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:346 build/trans_style.java:591
+#: build/trans_presets.java:346 build/trans_style.java:596
 msgid "tertiary"
 msgstr "silnice třetí třídy"
@@ -12788,5 +13738,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:346 build/trans_style.java:3106
+#: build/trans_presets.java:346 build/trans_style.java:3111
 msgid "residential"
 msgstr "obytná oblast"
@@ -12820,6 +13770,6 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:346 build/trans_style.java:647
-#: build/trans_style.java:4183
+#: build/trans_presets.java:346 build/trans_style.java:652
+#: build/trans_style.java:4188
 msgid "service"
 msgstr "obslužná cesta"
@@ -12846,6 +13796,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:346 build/trans_style.java:850
-#: build/trans_style.java:3171 build/trans_style.java:3172
+#: build/trans_presets.java:346 build/trans_style.java:855
+#: build/trans_style.java:3176 build/trans_style.java:3177
 msgid "construction"
 msgstr "konstrukce"
@@ -12895,5 +13845,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:408 build/trans_style.java:868
+#: build/trans_presets.java:408 build/trans_style.java:873
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -12982,5 +13932,5 @@
 #: build/trans_presets.java:522 build/trans_presets.java:543
 msgid "concrete"
-msgstr ""
+msgstr "beton"
 
 #: build/trans_presets.java:522 build/trans_presets.java:564
@@ -13872,5 +14822,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1119 build/trans_style.java:3347
+#: build/trans_presets.java:1119 build/trans_style.java:3352
 msgid "marsh"
 msgstr "mokřina"
@@ -15601,27 +16551,27 @@
 #: build/trans_presets.java:1800 build/trans_presets.java:1809
 #: build/trans_presets.java:1818 build/trans_presets.java:1827
-#: build/trans_style.java:3527 build/trans_style.java:3535
-#: build/trans_style.java:3543 build/trans_style.java:3551
-#: build/trans_style.java:3559 build/trans_style.java:3567
-#: build/trans_style.java:3575 build/trans_style.java:3583
-#: build/trans_style.java:3591 build/trans_style.java:3599
-#: build/trans_style.java:3607 build/trans_style.java:3615
-#: build/trans_style.java:3623 build/trans_style.java:3631
-#: build/trans_style.java:3639 build/trans_style.java:3647
-#: build/trans_style.java:3655 build/trans_style.java:3663
-#: build/trans_style.java:3671 build/trans_style.java:3679
-#: build/trans_style.java:3687 build/trans_style.java:3695
-#: build/trans_style.java:3703 build/trans_style.java:3711
-#: build/trans_style.java:3719 build/trans_style.java:3727
-#: build/trans_style.java:3735 build/trans_style.java:3743
-#: build/trans_style.java:3751 build/trans_style.java:3759
-#: build/trans_style.java:3767 build/trans_style.java:3775
-#: build/trans_style.java:3783 build/trans_style.java:3791
-#: build/trans_style.java:3799 build/trans_style.java:3807
-#: build/trans_style.java:3815 build/trans_style.java:3823
-#: build/trans_style.java:3831 build/trans_style.java:3839
-#: build/trans_style.java:3847 build/trans_style.java:3855
-#: build/trans_style.java:3863 build/trans_style.java:3871
-#: build/trans_style.java:3879
+#: build/trans_style.java:3532 build/trans_style.java:3540
+#: build/trans_style.java:3548 build/trans_style.java:3556
+#: build/trans_style.java:3564 build/trans_style.java:3572
+#: build/trans_style.java:3580 build/trans_style.java:3588
+#: build/trans_style.java:3596 build/trans_style.java:3604
+#: build/trans_style.java:3612 build/trans_style.java:3620
+#: build/trans_style.java:3628 build/trans_style.java:3636
+#: build/trans_style.java:3644 build/trans_style.java:3652
+#: build/trans_style.java:3660 build/trans_style.java:3668
+#: build/trans_style.java:3676 build/trans_style.java:3684
+#: build/trans_style.java:3692 build/trans_style.java:3700
+#: build/trans_style.java:3708 build/trans_style.java:3716
+#: build/trans_style.java:3724 build/trans_style.java:3732
+#: build/trans_style.java:3740 build/trans_style.java:3748
+#: build/trans_style.java:3756 build/trans_style.java:3764
+#: build/trans_style.java:3772 build/trans_style.java:3780
+#: build/trans_style.java:3788 build/trans_style.java:3796
+#: build/trans_style.java:3804 build/trans_style.java:3812
+#: build/trans_style.java:3820 build/trans_style.java:3828
+#: build/trans_style.java:3836 build/trans_style.java:3844
+#: build/trans_style.java:3852 build/trans_style.java:3860
+#: build/trans_style.java:3868 build/trans_style.java:3876
+#: build/trans_style.java:3884
 msgid "sport"
 msgstr "sport"
@@ -18460,7 +19410,7 @@
 #. <condition k="cycleway" v="opposite"/>
 #: build/trans_presets.java:3002 build/trans_style.java:224
-#: build/trans_style.java:663 build/trans_style.java:879
-#: build/trans_style.java:887 build/trans_style.java:895
-#: build/trans_style.java:903 build/trans_style.java:911
+#: build/trans_style.java:668 build/trans_style.java:884
+#: build/trans_style.java:892 build/trans_style.java:900
+#: build/trans_style.java:908 build/trans_style.java:916
 msgid "bicycle"
 msgstr "bicykl"
@@ -18530,7 +19480,7 @@
 #. <condition k="highway" v="steps"/>
 #: build/trans_presets.java:3002 build/trans_style.java:238
-#: build/trans_style.java:671 build/trans_style.java:679
-#: build/trans_style.java:687 build/trans_style.java:688
-#: build/trans_style.java:696
+#: build/trans_style.java:676 build/trans_style.java:684
+#: build/trans_style.java:692 build/trans_style.java:693
+#: build/trans_style.java:701
 msgid "foot"
 msgstr "pěší"
@@ -18556,5 +19506,5 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3002 build/trans_style.java:1179
+#: build/trans_presets.java:3002 build/trans_style.java:1184
 msgid "subway"
 msgstr "metro"
@@ -19045,13 +19995,13 @@
 #: build/trans_style.java:130 build/trans_style.java:165
 #: build/trans_style.java:172 build/trans_style.java:179
-#: build/trans_style.java:607 build/trans_style.java:804
-#: build/trans_style.java:1129 build/trans_style.java:2386
-#: build/trans_style.java:3338 build/trans_style.java:3339
-#: build/trans_style.java:3893 build/trans_style.java:4193
-#: build/trans_style.java:4202 build/trans_style.java:4211
-#: build/trans_style.java:4220 build/trans_style.java:4229
-#: build/trans_style.java:4238 build/trans_style.java:4247
-#: build/trans_style.java:4248 build/trans_style.java:4257
-#: build/trans_style.java:4266
+#: build/trans_style.java:612 build/trans_style.java:809
+#: build/trans_style.java:1134 build/trans_style.java:2391
+#: build/trans_style.java:3343 build/trans_style.java:3344
+#: build/trans_style.java:3898 build/trans_style.java:4198
+#: build/trans_style.java:4207 build/trans_style.java:4216
+#: build/trans_style.java:4225 build/trans_style.java:4234
+#: build/trans_style.java:4243 build/trans_style.java:4252
+#: build/trans_style.java:4253 build/trans_style.java:4262
+#: build/trans_style.java:4271
 msgid "deprecated"
 msgstr "zastaralý"
@@ -19093,5 +20043,5 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:266 build/trans_style.java:655
+#: build/trans_style.java:266 build/trans_style.java:660
 msgid "horse"
 msgstr "koňská"
@@ -19311,4 +20261,66 @@
 msgstr "překážka"
 
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bump_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="sally_port"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="portcullis"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="spikes"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bus_trap"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- highway tags -->
+#.
+#. <rule>
+#. <condition k="motorroad" v="yes"/>
+#: build/trans_style.java:527
+#, fuzzy
+msgid "motorroad"
+msgstr "Silnice pro motorová vozidla"
+
 #. color tertiary
 #. <icon annotate="true" src="misc/deprecated.png"/>
@@ -19343,6 +20355,6 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:599 build/trans_style.java:615
-#: build/trans_style.java:631 build/trans_style.java:639
+#: build/trans_style.java:604 build/trans_style.java:620
+#: build/trans_style.java:636 build/trans_style.java:644
 msgid "street"
 msgstr "ulice"
@@ -19398,7 +20410,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:623 build/trans_style.java:921
-#: build/trans_style.java:929 build/trans_style.java:937
-#: build/trans_style.java:945 build/trans_style.java:953
+#: build/trans_style.java:628 build/trans_style.java:926
+#: build/trans_style.java:934 build/trans_style.java:942
+#: build/trans_style.java:950 build/trans_style.java:958
 msgid "highway_track"
 msgstr "dálnice"
@@ -19454,8 +20466,8 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:704 build/trans_style.java:1153
-#: build/trans_style.java:1217 build/trans_style.java:1225
-#: build/trans_style.java:1234 build/trans_style.java:1242
-#: build/trans_style.java:1243
+#: build/trans_style.java:709 build/trans_style.java:1158
+#: build/trans_style.java:1222 build/trans_style.java:1230
+#: build/trans_style.java:1239 build/trans_style.java:1247
+#: build/trans_style.java:1248
 msgid "rail"
 msgstr "železnice"
@@ -19476,5 +20488,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:819
+#: build/trans_style.java:824
 msgid "services"
 msgstr ""
@@ -19488,5 +20500,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:827
+#: build/trans_style.java:832
 msgid "ford"
 msgstr "brod"
@@ -19507,5 +20519,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:842
+#: build/trans_style.java:847
 msgid "turningcircle"
 msgstr ""
@@ -19520,5 +20532,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:859
+#: build/trans_style.java:864
 msgid "emergency_access_point"
 msgstr ""
@@ -19533,5 +20545,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:971 build/trans_style.java:972
+#: build/trans_style.java:976 build/trans_style.java:977
 msgid "riverbank"
 msgstr "říční břeh"
@@ -19545,5 +20557,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:988
+#: build/trans_style.java:993
 msgid "stream"
 msgstr "potok"
@@ -19557,5 +20569,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1004
+#: build/trans_style.java:1009
 msgid "dock"
 msgstr ""
@@ -19583,7 +20595,7 @@
 #. <rule>
 #. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1026
+#: build/trans_style.java:1031
 msgid "aqueduct"
-msgstr ""
+msgstr "akvadukt"
 
 #. color aqueduct
@@ -19749,13 +20761,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1035 build/trans_style.java:1064
-#: build/trans_style.java:1072 build/trans_style.java:1073
-#: build/trans_style.java:1081 build/trans_style.java:1521
-#: build/trans_style.java:1528 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1570
-#: build/trans_style.java:1578 build/trans_style.java:1586
-#: build/trans_style.java:1594 build/trans_style.java:1601
-#: build/trans_style.java:1610 build/trans_style.java:1618
-#: build/trans_style.java:1626 build/trans_style.java:1634
+#: build/trans_style.java:1040 build/trans_style.java:1069
+#: build/trans_style.java:1077 build/trans_style.java:1078
+#: build/trans_style.java:1086 build/trans_style.java:1526
+#: build/trans_style.java:1533 build/trans_style.java:1542
+#: build/trans_style.java:1550 build/trans_style.java:1575
+#: build/trans_style.java:1583 build/trans_style.java:1591
+#: build/trans_style.java:1599 build/trans_style.java:1606
+#: build/trans_style.java:1615 build/trans_style.java:1623
+#: build/trans_style.java:1631 build/trans_style.java:1639
 msgid "manmade"
 msgstr ""
@@ -19817,7 +20829,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1091 build/trans_style.java:1106
-#: build/trans_style.java:1121 build/trans_style.java:1137
-#: build/trans_style.java:1145
+#: build/trans_style.java:1096 build/trans_style.java:1111
+#: build/trans_style.java:1126 build/trans_style.java:1142
+#: build/trans_style.java:1150
 msgid "railwaypoint"
 msgstr ""
@@ -19840,10 +20852,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1162 build/trans_style.java:1171
+#: build/trans_style.java:1167 build/trans_style.java:1176
 msgid "otherrail"
 msgstr ""
 
 #. color otherrail
-#: build/trans_style.java:1163
+#: build/trans_style.java:1168
 msgid "railover"
 msgstr ""
@@ -19879,7 +20891,7 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1187 build/trans_style.java:1197
-#: build/trans_style.java:1198 build/trans_style.java:1208
-#: build/trans_style.java:1209
+#: build/trans_style.java:1192 build/trans_style.java:1202
+#: build/trans_style.java:1203 build/trans_style.java:1213
+#: build/trans_style.java:1214
 msgid "oldrail"
 msgstr ""
@@ -19924,6 +20936,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1273 build/trans_style.java:1274
-#: build/trans_style.java:1306
+#: build/trans_style.java:1278 build/trans_style.java:1279
+#: build/trans_style.java:1311
 msgid "aeroway"
 msgstr ""
@@ -19937,5 +20949,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1282
+#: build/trans_style.java:1287
 msgid "terminal"
 msgstr "terminál"
@@ -19957,5 +20969,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1290 build/trans_style.java:1298
+#: build/trans_style.java:1295 build/trans_style.java:1303
 msgid "aeroway_dark"
 msgstr ""
@@ -19969,5 +20981,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1314
+#: build/trans_style.java:1319
 msgid "aeroway_light"
 msgstr ""
@@ -20015,7 +21027,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1324 build/trans_style.java:1332
-#: build/trans_style.java:1340 build/trans_style.java:1348
-#: build/trans_style.java:1356
+#: build/trans_style.java:1329 build/trans_style.java:1337
+#: build/trans_style.java:1345 build/trans_style.java:1353
+#: build/trans_style.java:1361
 msgid "aerialway"
 msgstr "lanovka"
@@ -20032,5 +21044,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1366 build/trans_style.java:1367
+#: build/trans_style.java:1371 build/trans_style.java:1372
 msgid "piste_easy"
 msgstr "lehká sjezdovka"
@@ -20045,5 +21057,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1375 build/trans_style.java:1376
+#: build/trans_style.java:1380 build/trans_style.java:1381
 msgid "piste_intermediate"
 msgstr "střední sjezdovka"
@@ -20058,5 +21070,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1384 build/trans_style.java:1385
+#: build/trans_style.java:1389 build/trans_style.java:1390
 msgid "piste_advanced"
 msgstr "těžká sjezdovka"
@@ -20071,5 +21083,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1393 build/trans_style.java:1394
+#: build/trans_style.java:1398 build/trans_style.java:1399
 msgid "piste_expert"
 msgstr ""
@@ -20084,5 +21096,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1402 build/trans_style.java:1403
+#: build/trans_style.java:1407 build/trans_style.java:1408
 msgid "piste_freeride"
 msgstr ""
@@ -20097,5 +21109,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1411 build/trans_style.java:1412
+#: build/trans_style.java:1416 build/trans_style.java:1417
 msgid "piste_novice"
 msgstr "sjezdovka pro začátečníky"
@@ -20200,10 +21212,10 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1423 build/trans_style.java:1430
-#: build/trans_style.java:1439 build/trans_style.java:1447
-#: build/trans_style.java:1455 build/trans_style.java:1463
-#: build/trans_style.java:1471 build/trans_style.java:1479
-#: build/trans_style.java:1487 build/trans_style.java:1495
-#: build/trans_style.java:1503 build/trans_style.java:1511
+#: build/trans_style.java:1428 build/trans_style.java:1435
+#: build/trans_style.java:1444 build/trans_style.java:1452
+#: build/trans_style.java:1460 build/trans_style.java:1468
+#: build/trans_style.java:1476 build/trans_style.java:1484
+#: build/trans_style.java:1492 build/trans_style.java:1500
+#: build/trans_style.java:1508 build/trans_style.java:1516
 msgid "power"
 msgstr ""
@@ -20217,5 +21229,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1552 build/trans_style.java:1553
+#: build/trans_style.java:1557 build/trans_style.java:1558
 msgid "pier"
 msgstr "molo"
@@ -20229,5 +21241,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1561
+#: build/trans_style.java:1566
 msgid "pipeline"
 msgstr "potrubí"
@@ -20355,12 +21367,12 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1644 build/trans_style.java:1652
-#: build/trans_style.java:1660 build/trans_style.java:1668
-#: build/trans_style.java:1676 build/trans_style.java:1684
-#: build/trans_style.java:1700 build/trans_style.java:1708
-#: build/trans_style.java:1716 build/trans_style.java:1724
-#: build/trans_style.java:1732 build/trans_style.java:1740
-#: build/trans_style.java:1748 build/trans_style.java:1756
-#: build/trans_style.java:1764
+#: build/trans_style.java:1649 build/trans_style.java:1657
+#: build/trans_style.java:1665 build/trans_style.java:1673
+#: build/trans_style.java:1681 build/trans_style.java:1689
+#: build/trans_style.java:1705 build/trans_style.java:1713
+#: build/trans_style.java:1721 build/trans_style.java:1729
+#: build/trans_style.java:1737 build/trans_style.java:1745
+#: build/trans_style.java:1753 build/trans_style.java:1761
+#: build/trans_style.java:1769
 msgid "leisure"
 msgstr ""
@@ -20374,5 +21386,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1692
+#: build/trans_style.java:1697
 msgid "marina"
 msgstr "přísav"
@@ -20444,8 +21456,8 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1774 build/trans_style.java:1782
-#: build/trans_style.java:1790 build/trans_style.java:1798
-#: build/trans_style.java:1806 build/trans_style.java:1814
-#: build/trans_style.java:1822 build/trans_style.java:1830
+#: build/trans_style.java:1779 build/trans_style.java:1787
+#: build/trans_style.java:1795 build/trans_style.java:1803
+#: build/trans_style.java:1811 build/trans_style.java:1819
+#: build/trans_style.java:1827 build/trans_style.java:1835
 msgid "amenity"
 msgstr "občanská vybavenost"
@@ -20547,10 +21559,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1838 build/trans_style.java:1846
-#: build/trans_style.java:1854 build/trans_style.java:1862
-#: build/trans_style.java:1870 build/trans_style.java:1878
-#: build/trans_style.java:1886 build/trans_style.java:1894
-#: build/trans_style.java:1902 build/trans_style.java:1909
-#: build/trans_style.java:1918 build/trans_style.java:1926
+#: build/trans_style.java:1843 build/trans_style.java:1851
+#: build/trans_style.java:1859 build/trans_style.java:1867
+#: build/trans_style.java:1875 build/trans_style.java:1883
+#: build/trans_style.java:1891 build/trans_style.java:1899
+#: build/trans_style.java:1907 build/trans_style.java:1914
+#: build/trans_style.java:1923 build/trans_style.java:1931
 msgid "amenity_traffic"
 msgstr ""
@@ -20936,22 +21948,22 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png"/>
-#: build/trans_style.java:1934 build/trans_style.java:1942
-#: build/trans_style.java:1950 build/trans_style.java:1958
-#: build/trans_style.java:1966 build/trans_style.java:1974
-#: build/trans_style.java:1982 build/trans_style.java:1990
-#: build/trans_style.java:2105 build/trans_style.java:2113
-#: build/trans_style.java:2120 build/trans_style.java:2129
-#: build/trans_style.java:2137 build/trans_style.java:2145
-#: build/trans_style.java:2153 build/trans_style.java:2161
-#: build/trans_style.java:2169 build/trans_style.java:2177
-#: build/trans_style.java:2240 build/trans_style.java:2248
-#: build/trans_style.java:2256 build/trans_style.java:2265
-#: build/trans_style.java:2273 build/trans_style.java:2280
-#: build/trans_style.java:2288 build/trans_style.java:2296
-#: build/trans_style.java:2304 build/trans_style.java:2312
-#: build/trans_style.java:2320 build/trans_style.java:2328
-#: build/trans_style.java:2336 build/trans_style.java:2344
-#: build/trans_style.java:2352 build/trans_style.java:2360
-#: build/trans_style.java:2369 build/trans_style.java:2377
+#: build/trans_style.java:1939 build/trans_style.java:1947
+#: build/trans_style.java:1955 build/trans_style.java:1963
+#: build/trans_style.java:1971 build/trans_style.java:1979
+#: build/trans_style.java:1987 build/trans_style.java:1995
+#: build/trans_style.java:2110 build/trans_style.java:2118
+#: build/trans_style.java:2125 build/trans_style.java:2134
+#: build/trans_style.java:2142 build/trans_style.java:2150
+#: build/trans_style.java:2158 build/trans_style.java:2166
+#: build/trans_style.java:2174 build/trans_style.java:2182
+#: build/trans_style.java:2245 build/trans_style.java:2253
+#: build/trans_style.java:2261 build/trans_style.java:2270
+#: build/trans_style.java:2278 build/trans_style.java:2285
+#: build/trans_style.java:2293 build/trans_style.java:2301
+#: build/trans_style.java:2309 build/trans_style.java:2317
+#: build/trans_style.java:2325 build/trans_style.java:2333
+#: build/trans_style.java:2341 build/trans_style.java:2349
+#: build/trans_style.java:2357 build/trans_style.java:2365
+#: build/trans_style.java:2374 build/trans_style.java:2382
 msgid "amenity_light"
 msgstr ""
@@ -20983,6 +21995,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:1998 build/trans_style.java:2006
-#: build/trans_style.java:3257
+#: build/trans_style.java:2003 build/trans_style.java:2011
+#: build/trans_style.java:3262
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -21043,8 +22055,8 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2184 build/trans_style.java:2192
-#: build/trans_style.java:2200 build/trans_style.java:2209
-#: build/trans_style.java:2216 build/trans_style.java:2224
-#: build/trans_style.java:2232
+#: build/trans_style.java:2189 build/trans_style.java:2197
+#: build/trans_style.java:2205 build/trans_style.java:2214
+#: build/trans_style.java:2221 build/trans_style.java:2229
+#: build/trans_style.java:2237
 msgid "health"
 msgstr "zdravotnictví"
@@ -21397,26 +22409,26 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2396 build/trans_style.java:2404
-#: build/trans_style.java:2412 build/trans_style.java:2420
-#: build/trans_style.java:2428 build/trans_style.java:2436
-#: build/trans_style.java:2444 build/trans_style.java:2452
-#: build/trans_style.java:2460 build/trans_style.java:2468
-#: build/trans_style.java:2476 build/trans_style.java:2484
-#: build/trans_style.java:2492 build/trans_style.java:2500
-#: build/trans_style.java:2508 build/trans_style.java:2516
-#: build/trans_style.java:2524 build/trans_style.java:2532
-#: build/trans_style.java:2540 build/trans_style.java:2548
-#: build/trans_style.java:2556 build/trans_style.java:2564
-#: build/trans_style.java:2572 build/trans_style.java:2580
-#: build/trans_style.java:2588 build/trans_style.java:2596
-#: build/trans_style.java:2604 build/trans_style.java:2612
-#: build/trans_style.java:2620 build/trans_style.java:2628
-#: build/trans_style.java:2636 build/trans_style.java:2644
-#: build/trans_style.java:2652 build/trans_style.java:2660
-#: build/trans_style.java:2668 build/trans_style.java:2676
-#: build/trans_style.java:2684 build/trans_style.java:2692
-#: build/trans_style.java:2700 build/trans_style.java:2708
-#: build/trans_style.java:2716 build/trans_style.java:2724
-#: build/trans_style.java:2733
+#: build/trans_style.java:2401 build/trans_style.java:2409
+#: build/trans_style.java:2417 build/trans_style.java:2425
+#: build/trans_style.java:2433 build/trans_style.java:2441
+#: build/trans_style.java:2449 build/trans_style.java:2457
+#: build/trans_style.java:2465 build/trans_style.java:2473
+#: build/trans_style.java:2481 build/trans_style.java:2489
+#: build/trans_style.java:2497 build/trans_style.java:2505
+#: build/trans_style.java:2513 build/trans_style.java:2521
+#: build/trans_style.java:2529 build/trans_style.java:2537
+#: build/trans_style.java:2545 build/trans_style.java:2553
+#: build/trans_style.java:2561 build/trans_style.java:2569
+#: build/trans_style.java:2577 build/trans_style.java:2585
+#: build/trans_style.java:2593 build/trans_style.java:2601
+#: build/trans_style.java:2609 build/trans_style.java:2617
+#: build/trans_style.java:2625 build/trans_style.java:2633
+#: build/trans_style.java:2641 build/trans_style.java:2649
+#: build/trans_style.java:2657 build/trans_style.java:2665
+#: build/trans_style.java:2673 build/trans_style.java:2681
+#: build/trans_style.java:2689 build/trans_style.java:2697
+#: build/trans_style.java:2705 build/trans_style.java:2713
+#: build/trans_style.java:2721 build/trans_style.java:2729
+#: build/trans_style.java:2738
 msgid "shop"
 msgstr "obchod"
@@ -21488,8 +22500,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2743 build/trans_style.java:2751
-#: build/trans_style.java:2759 build/trans_style.java:2767
-#: build/trans_style.java:2775 build/trans_style.java:2783
-#: build/trans_style.java:2791 build/trans_style.java:2799
+#: build/trans_style.java:2748 build/trans_style.java:2756
+#: build/trans_style.java:2764 build/trans_style.java:2772
+#: build/trans_style.java:2780 build/trans_style.java:2788
+#: build/trans_style.java:2796 build/trans_style.java:2804
 msgid "hotel"
 msgstr "hotel"
@@ -21639,9 +22651,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2807 build/trans_style.java:2815
-#: build/trans_style.java:2823 build/trans_style.java:2831
-#: build/trans_style.java:2839 build/trans_style.java:2847
-#: build/trans_style.java:2848 build/trans_style.java:2856
-#: build/trans_style.java:2872 build/trans_style.java:2943
+#: build/trans_style.java:2812 build/trans_style.java:2820
+#: build/trans_style.java:2828 build/trans_style.java:2836
+#: build/trans_style.java:2844 build/trans_style.java:2852
+#: build/trans_style.java:2853 build/trans_style.java:2861
+#: build/trans_style.java:2877 build/trans_style.java:2948
 msgid "tourism"
 msgstr "turistika"
@@ -21713,8 +22725,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:2953 build/trans_style.java:2961
-#: build/trans_style.java:2969 build/trans_style.java:2977
-#: build/trans_style.java:2985 build/trans_style.java:2993
-#: build/trans_style.java:3001 build/trans_style.java:3009
+#: build/trans_style.java:2958 build/trans_style.java:2966
+#: build/trans_style.java:2974 build/trans_style.java:2982
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
 msgid "historic"
 msgstr "historické"
@@ -21785,8 +22797,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3018 build/trans_style.java:3026
-#: build/trans_style.java:3034 build/trans_style.java:3042
-#: build/trans_style.java:3090 build/trans_style.java:3098
-#: build/trans_style.java:3196 build/trans_style.java:3204
+#: build/trans_style.java:3023 build/trans_style.java:3031
+#: build/trans_style.java:3039 build/trans_style.java:3047
+#: build/trans_style.java:3095 build/trans_style.java:3103
+#: build/trans_style.java:3201 build/trans_style.java:3209
 msgid "green"
 msgstr "zeleň"
@@ -21800,5 +22812,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3050
+#: build/trans_style.java:3055
 msgid "quarry"
 msgstr "lom"
@@ -21812,5 +22824,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3058
+#: build/trans_style.java:3063
 msgid "landfill"
 msgstr "skládka"
@@ -21832,5 +22844,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3066 build/trans_style.java:3074
+#: build/trans_style.java:3071 build/trans_style.java:3079
 msgid "basin"
 msgstr "nádrže"
@@ -21844,5 +22856,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3082
+#: build/trans_style.java:3087
 msgid "forest"
 msgstr "les"
@@ -21856,5 +22868,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3114
+#: build/trans_style.java:3119
 msgid "farmyard"
 msgstr "zemědělství"
@@ -21877,5 +22889,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3123 build/trans_style.java:3131
+#: build/trans_style.java:3128 build/trans_style.java:3136
 msgid "retail"
 msgstr "obchody"
@@ -21889,5 +22901,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3139
+#: build/trans_style.java:3144
 msgid "industrial"
 msgstr "průmysl"
@@ -21901,5 +22913,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3147
+#: build/trans_style.java:3152
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -21913,5 +22925,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3155
+#: build/trans_style.java:3160
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -21925,5 +22937,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3163
+#: build/trans_style.java:3168
 msgid "railland"
 msgstr "železniční plochy"
@@ -21980,7 +22992,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3180 build/trans_style.java:3215
-#: build/trans_style.java:3223 build/trans_style.java:3231
-#: build/trans_style.java:3239 build/trans_style.java:3247
+#: build/trans_style.java:3185 build/trans_style.java:3220
+#: build/trans_style.java:3228 build/trans_style.java:3236
+#: build/trans_style.java:3244 build/trans_style.java:3252
 msgid "military"
 msgstr "vojenský"
@@ -21994,5 +23006,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3188
+#: build/trans_style.java:3193
 msgid "cemetery"
 msgstr "hřbitov"
@@ -22005,5 +23017,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3264
+#: build/trans_style.java:3269
 msgid "peak"
 msgstr "vrchol"
@@ -22018,5 +23030,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3273
+#: build/trans_style.java:3278
 msgid "glacier"
 msgstr "ledovec"
@@ -22030,5 +23042,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3281
+#: build/trans_style.java:3286
 msgid "volcano"
 msgstr "sopka"
@@ -22083,8 +23095,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3289 build/trans_style.java:3290
-#: build/trans_style.java:3298 build/trans_style.java:3314
-#: build/trans_style.java:3387 build/trans_style.java:3395
-#: build/trans_style.java:3403
+#: build/trans_style.java:3294 build/trans_style.java:3295
+#: build/trans_style.java:3303 build/trans_style.java:3319
+#: build/trans_style.java:3392 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "natural"
 msgstr "přírodní"
@@ -22098,5 +23110,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3306
+#: build/trans_style.java:3311
 msgid "scrub"
 msgstr "křoví"
@@ -22110,5 +23122,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3322
+#: build/trans_style.java:3327
 msgid "heath"
 msgstr "vřesoviště"
@@ -22122,5 +23134,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3330
+#: build/trans_style.java:3335
 msgid "wood"
 msgstr "Prales"
@@ -22134,5 +23146,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3371
+#: build/trans_style.java:3376
 msgid "mud"
 msgstr "bahno"
@@ -22146,5 +23158,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3379
+#: build/trans_style.java:3384
 msgid "beach"
 msgstr "pláž"
@@ -22222,8 +23234,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3419 build/trans_style.java:3427
-#: build/trans_style.java:3435 build/trans_style.java:3443
-#: build/trans_style.java:3451 build/trans_style.java:3459
-#: build/trans_style.java:3467 build/trans_style.java:3475
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440 build/trans_style.java:3448
+#: build/trans_style.java:3456 build/trans_style.java:3464
+#: build/trans_style.java:3472 build/trans_style.java:3480
 msgid "route"
 msgstr "cesta"
@@ -22271,7 +23283,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3485 build/trans_style.java:3493
-#: build/trans_style.java:3501 build/trans_style.java:3509
-#: build/trans_style.java:3517
+#: build/trans_style.java:3490 build/trans_style.java:3498
+#: build/trans_style.java:3506 build/trans_style.java:3514
+#: build/trans_style.java:3522
 msgid "boundary"
 msgstr "hranice"
@@ -22413,10 +23425,10 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:3941 build/trans_style.java:3949
-#: build/trans_style.java:3957 build/trans_style.java:3965
-#: build/trans_style.java:3973 build/trans_style.java:3981
-#: build/trans_style.java:3989 build/trans_style.java:3997
-#: build/trans_style.java:4005 build/trans_style.java:4013
-#: build/trans_style.java:4021 build/trans_style.java:4029
+#: build/trans_style.java:3946 build/trans_style.java:3954
+#: build/trans_style.java:3962 build/trans_style.java:3970
+#: build/trans_style.java:3978 build/trans_style.java:3986
+#: build/trans_style.java:3994 build/trans_style.java:4002
+#: build/trans_style.java:4010 build/trans_style.java:4018
+#: build/trans_style.java:4026 build/trans_style.java:4034
 msgid "place"
 msgstr "místo"
@@ -22464,6 +23476,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4146 build/trans_style.java:4153
-#: build/trans_style.java:4160 build/trans_style.java:4167
+#: build/trans_style.java:4151 build/trans_style.java:4158
+#: build/trans_style.java:4165 build/trans_style.java:4172
 msgid "address"
 msgstr "adresa"
@@ -22760,24 +23772,152 @@
 msgstr ""
 
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "Selhala inicializace API, prosím zkuste to znovu později."
+
+#~ msgid "API initialization failed"
+#~ msgstr "Selhala inicializace API"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Nenalezena aktuální data. Opravdu máte otevřenou nebo staženou datovou "
+#~ "vrstvu?"
+
+#~ msgid "No data"
+#~ msgstr "Žádná data"
+
+#~ msgid "Update failed"
+#~ msgstr "Aktualizace selhala"
+
+#~ msgid "Missing primitive"
+#~ msgstr "Chybějící prvek"
+
+#~ msgid "Apply partial resolutions"
+#~ msgstr "Aplikovat částečná řešení"
+
+#~ msgid "Layers: {0}"
+#~ msgstr "Vrstvy: {0}"
+
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "Odstranit prvek v aktuálním řádku tabulky z relace"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Plugin nebylo možné odstranit. Prosíme informujte o tomto problému "
+#~ "vývojáře JOSM."
+
+#~ msgid "Validate"
+#~ msgstr "Ověřit"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Ověřit buď aktuální výběr, nebo kompletní data."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
 #~ msgid "Data Layer"
 #~ msgstr "Vrstva dat"
 
-#~ msgid "Uploading data"
-#~ msgstr "Nahrávám data"
+#~ msgid "unnamed"
+#~ msgstr "nepojmenováno"
+
+#~ msgid "Change"
+#~ msgstr "Změnit"
+
+#~ msgid "Rotate"
+#~ msgstr "Otočit"
+
+#~ msgid "false"
+#~ msgstr "nepravda"
+
+#~ msgid "true"
+#~ msgstr "pravda"
+
+#~ msgid "different"
+#~ msgstr "různé"
+
+#~ msgid "position"
+#~ msgstr "pozice"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "their version:"
+#~ msgstr "verze na serveru:"
+
+#~ msgid "resolved version:"
+#~ msgstr "finální verze:"
+
+#~ msgid "my version:"
+#~ msgstr "moje verze:"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Revert"
+#~ msgstr "Vrátit zpět"
 
 #~ msgid "Not implemented yet."
 #~ msgstr "Zatím neimplementováno."
 
-#~ msgid "Email"
-#~ msgstr "E-mail"
+#~ msgid "Add Selected"
+#~ msgstr "Přidat vybrané"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Nemohu se připojit na server."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Vznikly konflikty během importu"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Chyba parsování odezvy serveru"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Kontaktuji OSM server..."
 
 #~ msgid "Resolve Conflicts"
 #~ msgstr "Vyřešit konflikty"
 
-#~ msgid "There were conflicts during import."
-#~ msgstr "Vznikly konflikty během importu"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM uživatelské jméno (email)"
+
+#~ msgid "Aborting..."
+#~ msgstr "Přerušuji..."
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Upravit pozici WMS vrstvy"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Přihlašovací jméno (email) k OSM účtu."
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Vyřešit {0} konfliktů v {1} objektech"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie."
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME oprava)"
 
 #~ msgid "{0} object has conflicts:"
@@ -22786,82 +23926,4 @@
 #~ msgstr[1] "{0} objekty mají konflikty:"
 #~ msgstr[2] "{0} objektů má konflikty:"
-
-#~ msgid "my version:"
-#~ msgstr "moje verze:"
-
-#~ msgid "their version:"
-#~ msgstr "verze na serveru:"
-
-#~ msgid "resolved version:"
-#~ msgstr "finální verze:"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Přihlašovací jméno (email) k OSM účtu."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM uživatelské jméno (email)"
-
-#~ msgid "Unknown host"
-#~ msgstr "Neznámé jméno počítače"
-
-#~ msgid "position"
-#~ msgstr "pozice"
-
-#~ msgid "different"
-#~ msgstr "různé"
-
-#~ msgid "true"
-#~ msgstr "pravda"
-
-#~ msgid "false"
-#~ msgstr "nepravda"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Vyřešit {0} konfliktů v {1} objektech"
-
-#~ msgid "Change"
-#~ msgstr "Změnit"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Klikněte na obnovit pro aktualizaci seznamu"
-
-#~ msgid "Revert"
-#~ msgstr "Vrátit zpět"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Vrátit stav všech vybraných objektů na verzi vybranou ze seznamu historie."
-
-#~ msgid "Rotate"
-#~ msgstr "Otočit"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tagy (prázdná hodnota vymaže tag)"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Chyba parsování odezvy serveru"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Nemohu se připojit na server."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki."
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Zdroj přednastavených tagů"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Přidat nový zdroj přednastavených tagů na seznam."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Zdroje přednastavení tagů"
 
 #~ msgid ""
@@ -22872,6 +23934,18 @@
 #~ "zmenšit oblast."
 
-#~ msgid "Commit comment"
-#~ msgstr "Poslat komentář"
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}."
+
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Chyba při mazání souboru pluginu: {0}"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Plugin již existuje"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Nemohu stáhnout plugin: {0} z {1}"
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -22881,80 +23955,12 @@
 #~ msgstr[2] "{0} pluginů úspěšně aktualizováno. Prosím, restartujte JOSM."
 
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Nemohu stáhnout plugin: {0} z {1}"
-
-#~ msgid "image not loaded"
-#~ msgstr "obrázek nebyl nahrán"
-
-#~ msgid ""
-#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
-#~ "move mouse.   Select: Click."
-#~ msgstr ""
-#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé "
-#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí."
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Upravit pozici WMS vrstvy"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME oprava)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server nepodporuje sady změn"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Přenos přerušen kvůli chybě (čekám 5 sekund):"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Následující plugin vyžaduje aktulizaci JOSM: {0}."
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Plugin již existuje"
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Chyba při mazání souboru pluginu: {0}"
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
 
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Některé z uzlů jsou (skoro) v přímce"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Padací most"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Opravdu označit tento problém jako \"hotový\"?"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importovat TCX soubor..."
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importovat TCX soubor jako GPS trasu"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s "
-#~ "nastavením.<br>Heslo je na server posíláno nezašifrované, zakódované v "
-#~ "URL.<br><b>Nepoužívejte stejné heslo, které používáte někde jinde.</b></"
-#~ "html>"
-
-#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
-#~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta"
 
 #~ msgid ""
@@ -22977,4 +23983,155 @@
 #~ "Nenáhrávejte žádná data po zobrazení této hlášky!"
 
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Opravdu označit tento problém jako \"hotový\"?"
+
+#~ msgid "Commit comment"
+#~ msgstr "Poslat komentář"
+
+#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
+#~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konflikty: {0}"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importovat TCX soubor jako GPS trasu"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importovat TCX soubor..."
+
+#~ msgid "viaduct"
+#~ msgstr "viadukt"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Padací most"
+
+#~ msgid "Occupied By"
+#~ msgstr "Obsazeno"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Tagy (prázdná hodnota vymaže tag)"
+
+#~ msgid "Remove Selected"
+#~ msgstr "Odebrat označené"
+
+#~ msgid "Basic"
+#~ msgstr "Základní"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Přidat všechny zvolené objekty mezi prvky"
+
+#~ msgid ""
+#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
+#~ msgstr ""
+#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou "
+#~ "{1}"
+
+#~ msgid "No intersections found. Nothing was changed."
+#~ msgstr "Nenalezen průsečík. Nic nebylo změněno."
+
+#~ msgid "sports"
+#~ msgstr "Sportovní potřeby"
+
+#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr "Přeskakuji cestu, protože obsahuje neexistující uzel: {0}\n"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Server nepodporuje sady změn"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Zdroje přednastavení tagů"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Zdroj přednastavených tagů"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Přidat nový zdroj přednastavených tagů na seznam."
+
+#~ msgid "Delete and Download"
+#~ msgstr "Smazat a stáhnout"
+
+#~ msgid "image not loaded"
+#~ msgstr "obrázek nebyl nahrán"
+
+#~ msgid "Download Image from french Cadastre WMS"
+#~ msgstr "Stáhnout obrázek z WMS francouzského katastru"
+
+#~ msgid "Move Down"
+#~ msgstr "Posunout dolů"
+
+#~ msgid "Move Up"
+#~ msgstr "Posunout nahoru"
+
+#~ msgid "Relation Editor: {0}"
+#~ msgstr "Editor relací: {0}"
+
+#~ msgid ""
+#~ "<html>WARNING: The password is stored in plain text in the preferences "
+#~ "file.<br>The password is transfered in plain text to the server, encoded "
+#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>VAROVÁNÍ: Heslo je uloženo v textovém formátu v souboru s "
+#~ "nastavením.<br>Heslo je na server posíláno nezašifrované, zakódované v "
+#~ "URL.<br><b>Nepoužívejte stejné heslo, které používáte někde jinde.</b></"
+#~ "html>"
+
+#~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na "
+#~ "server mají historii."
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr ""
+#~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?"
+
+#~ msgid "Edit Drawbridge"
+#~ msgstr "Upravit padací most"
+
+#~ msgid "Edit Portcullis"
+#~ msgstr "Upravit zkratky"
+
+#~ msgid "The following errors occured during mass download:"
+#~ msgstr "Následující chyby nastaly při hromadném stahování:"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
+#~ msgstr ""
+#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
+#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
+
+#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
+#~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326"
+
+#~ msgid ""
+#~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
+#~ "move mouse.   Select: Click."
+#~ msgstr ""
+#~ "Zoom: pomocí kolečka myši nebo dvojkliku. Posun mapy: stiskni pravé "
+#~ "tlačítko a pohybuj myší. Vybrat: Kliknutí."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Zadejte buď site-josm.xml nebo stránky Wiki."
+
+#~ msgid "Directly load TCX files from JOSM."
+#~ msgstr "Otevře soubory TCX přímo v JOSM."
+
+#~ msgid ""
+#~ "The main feature of the plugin is the possibility to delete points of the "
+#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
+#~ "OSM eg. deleting uninteresting parts of track."
+#~ msgstr ""
+#~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento "
+#~ "plugin může být použit pro přípravu tras pro uploud do OSM."
+
 #~ msgid ""
 #~ "Plugin archive already available. Do you want to download the current "
@@ -22988,50 +24145,4 @@
 #~ "{0}"
 
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konflikty: {0}"
-
-#~ msgid "viaduct"
-#~ msgstr "viadukt"
-
-#~ msgid "Open the OpenStreetBugs window and activate the automatic download"
-#~ msgstr "Otevře okno OpenStreetBugs a aktivuje automatické stahování"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Nelze načíst projekci z uloženého nastavení. Používám EPSG:4326"
-
-#~ msgid "sports"
-#~ msgstr "Sportovní potřeby"
-
-#~ msgid "Download Image from french Cadastre WMS"
-#~ msgstr "Stáhnout obrázek z WMS francouzského katastru"
-
-#~ msgid ""
-#~ "Lambert zone {0} in cache  incompatible with current Lambert zone {1}"
-#~ msgstr ""
-#~ "Lambertova zóna {0} v cache nekompatibilní se současnou Lambertovou zónou "
-#~ "{1}"
-
-#~ msgid "Delete and Download"
-#~ msgstr "Smazat a stáhnout"
-
-#~ msgid "No intersections found. Nothing was changed."
-#~ msgstr "Nenalezen průsečík. Nic nebylo změněno."
-
-#~ msgid "Solve Conflict"
-#~ msgstr "Vyřešit konfklikt"
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Vyberte alespoň jeden uzel, cestu, nebo relaci. Pouze objekty nahrané na "
-#~ "server mají historii."
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr ""
-#~ "Tato akce bude potřebovat {0} jednotlivých stažení dat. Chcete pokračovat?"
-
 #~ msgid ""
 #~ "An error occured while trying to match the photos to the GPX track. You "
@@ -23041,34 +24152,6 @@
 #~ "upravit posuvníky aby byli fotografie dosazeny."
 
-#~ msgid "The following errors occured during mass download:"
-#~ msgstr "Následující chyby nastaly při hromadném stahování:"
-
-#~ msgid "Edit Drawbridge"
-#~ msgstr "Upravit padací most"
-
-#~ msgid "Edit Portcullis"
-#~ msgstr "Upravit zkratky"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
-#~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">english</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Stránka s nápovědou chybí. Udělej jí v <A HREF=\"{0}\">angličtině</A> "
-#~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
-
-#~ msgid "Directly load TCX files from JOSM."
-#~ msgstr "Otevře soubory TCX přímo v JOSM."
-
-#~ msgid ""
-#~ "The main feature of the plugin is the possibility to delete points of the "
-#~ "GPX track. This plugin can be used to prepare  tracks for uploading to "
-#~ "OSM eg. deleting uninteresting parts of track."
-#~ msgstr ""
-#~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento "
-#~ "plugin může být použit pro přípravu tras pro uploud do OSM."
+#~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
+#~ msgstr "Stáhne zaměřený obrázek z WMS zaměřovače na stránkách Metacarta"
 
 #~ msgid ""
