Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 17103)
+++ applications/editors/josm/i18n/po/cs.po	(revision 17485)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-18 13:46+0200\n"
-"PO-Revision-Date: 2009-08-18 08:44+0000\n"
-"Last-Translator: Jezevec <Unknown>\n"
+"POT-Creation-Date: 2009-09-06 13:51+0200\n"
+"PO-Revision-Date: 2009-08-18 14:24+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,77 +16,80 @@
 "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-08-18 11:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-06 11:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:186
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
+#: ../core/src/org/openstreetmap/josm/Main.java:193
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:143
 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:196
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:60
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:315
+#: ../core/src/org/openstreetmap/josm/Main.java:203
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:318
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:289
+#: ../core/src/org/openstreetmap/josm/Main.java:296
 #, 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: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/OpenFileAction.java:60
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:100
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:95
-#: ../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:45
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:87
-#: ../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/Main.java:297
+#: ../core/src/org/openstreetmap/josm/Main.java:510
+#: ../core/src/org/openstreetmap/josm/Main.java:534
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:84
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:88
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:381
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:392
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:415
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:428
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:50
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:70
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:66
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:138
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
-#: ../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/io/GpxExporter.java:172
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
-#: ../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:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java:119
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:624
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:632
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:110
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:176
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:185
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:28
@@ -96,154 +99,161 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:70
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:77
-#: ../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:163
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:352
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:282
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:289
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:218
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:414
 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:400
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:303
+#: ../core/src/org/openstreetmap/josm/Main.java:445
+#, fuzzy, java-format
+msgid ""
+"There are unsaved changes in {0} layer. Discard the changes and continue?"
+msgid_plural ""
+"There are unsaved changes in {0} layers. Discard the changes and continue?"
+msgstr[0] "Máte neuložené změny. Zahodit změny a pokračovat?"
+msgstr[1] "Máte neuložené změny. Zahodit změny a pokračovat?"
+msgstr[2] "Máte neuložené změny. Zahodit změny a pokračovat?"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:452
 msgid "Unsaved Changes"
 msgstr "Neuložené změny"
 
-#: ../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:402
+#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Save and Exit"
 msgstr "Uložit a ukončit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:402
+#: ../core/src/org/openstreetmap/josm/Main.java:453
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Discard and Exit"
 msgstr "Neuložit změny a ukončit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:402
+#: ../core/src/org/openstreetmap/josm/Main.java:453
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:48
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
-#: ../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:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:327
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:852
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
 #: ../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/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 #: ../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:150
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:431
+#: ../core/src/org/openstreetmap/josm/Main.java:477
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorují se nekorektní URL: \"{0}\""
 
-#: ../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:206
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:116
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:79
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:256
-#: ../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:69
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:104
-#: ../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:347
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:353
-#: ../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:360
-#: ../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:684
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1559
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
+#: ../core/src/org/openstreetmap/josm/Main.java:478
+#: ../core/src/org/openstreetmap/josm/Main.java:497
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:260
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:141
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:301
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:70
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:184
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:213
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:249
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:92
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:144
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:85
 #: ../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:128
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:137
 msgid "Warning"
 msgstr "Varování"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:449
+#: ../core/src/org/openstreetmap/josm/Main.java:496
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoruji poškozený soubor z URL: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:509
+#: ../core/src/org/openstreetmap/josm/Main.java:533
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:92
+#, fuzzy, java-format
+msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
+msgstr "<html>Nemohu přečíst soubor ''{0}''. Chyba je: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -268,7 +278,8 @@
 #: ../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:159
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -306,5 +317,5 @@
 #. </button>
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:27
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
 #: build/trans_surveyor.java:64
 msgid "Info"
@@ -328,6 +339,6 @@
 
 #: ../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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
 msgid "Plugins"
 msgstr "Pluginy"
@@ -342,8 +353,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:39
-#, java-format
-msgid ""
-"WARNING: unexpected format of API base URL. Redirection to history page for "
-"OSM primitive will probably fail. API base URL is: ''{0}''"
+#, fuzzy, java-format
+msgid ""
+"WARNING: unexpected format of API base URL. Redirection to info or history "
+"page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
 "UPOZORNĚNÍ: Neočekávaný formát základního URL API. Přesměrování na stránku s "
@@ -351,9 +362,19 @@
 "\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
+#, fuzzy, java-format
+msgid ""
+"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
+"user will probably fail. API base URL is: ''{0}''"
+msgstr ""
+"UPOZORNĚNÍ: Neočekávaný formát základního URL API. Přesměrování na stránku s "
+"historií pro OSM element pravděpodobně skončí chybou. Základní URL API je: "
+"\"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
 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:74
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:105
 #, java-format
 msgid ""
@@ -364,5 +385,5 @@
 "primitiv."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
 msgid "Please select the target layer."
 msgstr "Prosím vyberte cílovou vrstvu."
@@ -372,11 +393,11 @@
 msgstr "Vybrat cílovou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:539
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
 msgid "Merge"
 msgstr "Sloučit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
 #, java-format
 msgid ""
@@ -387,5 +408,5 @@
 "být sloučeny.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
 msgid "No target layers"
 msgstr "Žádné cílové vrstvy"
@@ -402,11 +423,11 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
 #: ../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/MergeSelectionAction.java:20
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
 #: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
@@ -435,5 +456,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:193
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:82
 msgid "Latitude"
 msgstr "Zeměpisná šířka"
@@ -442,30 +463,30 @@
 #: ../plugins/grid/src/grid/GridLayer.java:195
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:85
 msgid "Longitude"
 msgstr "Zeměpisná délka"
 
+#: ../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:38
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:255
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:254
 msgid "Align Nodes in Circle"
 msgstr "Seřadit uzly do kruhu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../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:38
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
+#: ../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:31
 #: ../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:35
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../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:54
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:52
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -479,6 +500,6 @@
 #: ../plugins/terracer/src/terracer/TerracerAction.java:72
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:100
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
 #, java-format
@@ -486,58 +507,57 @@
 msgstr "Nástroj: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:138
+#: ../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:139
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:73
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:165
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:140
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:267
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
-#: ../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/actions/AlignInCircleAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:169
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:334
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:111
 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:34
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:131
 msgid "Align Nodes in Line"
 msgstr "Seřadit uzly do přímky"
 
-#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:32
 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:65
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:64
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:63
 msgid "Please select at least three nodes."
 msgstr "Vyberte minimálně 3 uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:53
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:52
 #, java-format
 msgid ""
@@ -548,10 +568,10 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:57
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:109
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:108
 msgid "API Capabilities Violation"
 msgstr "Narušení schopností API"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:78
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:77
 #, java-format
 msgid ""
@@ -561,5 +581,5 @@
 "Upozornění: automaticky mažu hodnotu tagu ''{0}'' na smazaném primitivu {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:87
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:86
 #, java-format
 msgid ""
@@ -570,9 +590,9 @@
 "Délka hodnoty je {3}."
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:90
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:89
 msgid "Precondition Violation"
 msgstr "Selhal předpoklad"
 
-#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:103
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
@@ -580,37 +600,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:30
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "data"
 msgstr "data"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "layer"
 msgstr "vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "selection"
 msgstr "výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29
 msgid "download"
 msgstr "stáhnout"
 
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zvětšit na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:55
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zvětšit pohled na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:16
@@ -620,22 +640,22 @@
 msgstr "Zobrazení: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
 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:125
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:124
 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:72
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 msgid "Please select at least two ways to combine."
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
@@ -646,4 +666,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:123
+msgid "Combine Anyway"
+msgstr "Přesto zkombinovat"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
 msgid ""
 "The selected ways have differing relation memberships.  Do you still want to "
@@ -651,19 +675,7 @@
 msgstr "Vybrané cesty patří do jiné relace. Opravdu je chcete spojit?"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:125
-msgid "Combine Anyway"
-msgstr "Přesto zkombinovat"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:156
 msgid "Change directions?"
 msgstr "Změnit směr ?"
-
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:155
-msgid ""
-"The ways can not be combined in their current directions.  Do you want to "
-"reverse some of them?"
-msgstr ""
-"Cesty nemohou být spojeny kvůli rozdílné orientaci. Chcete sjednotit jejich "
-"orientaci?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:157
@@ -671,27 +683,34 @@
 msgstr "Otočit a zkombinovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:209
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:203
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:159
+msgid ""
+"The ways can not be combined in their current directions.  Do you want to "
+"reverse some of them?"
+msgstr ""
+"Cesty nemohou být spojeny kvůli rozdílné orientaci. Chcete sjednotit jejich "
+"orientaci?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:204
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:295
 msgid "Enter values for all conflicts."
 msgstr "Zadej hodnoty pro všechny konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:205
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:304
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:206
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 msgid "Solve Conflicts"
 msgstr "Vyřešit konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:246
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:253
 #, java-format
 msgid "Combine {0} ways"
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:279
 msgid "All the ways were empty"
 msgstr "Všechny cesty byli prázdné"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:302
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:309
 msgid ""
 "Could not combine ways (They could not be merged into a single string of "
@@ -699,32 +718,32 @@
 msgstr "Nemohu spojit cesty (Nemohou být spojeny do jednoho řetězce bodů)"
 
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:32
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:36
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:33
 msgid "Copy selected objects to paste buffer."
 msgstr "Vybrat označené objekty pro vložení."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:139
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:126
 msgid "Please select something to copy."
 msgstr "Prosím zvol něco ke kopírování"
 
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:46
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:273
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
 msgid "Create Circle"
 msgstr "Vytvořit kruh"
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../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:205
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
 msgid "Those nodes are not in a circle. Aborting."
 msgstr "Tyto body nejsou v kruhu. Přerušuji."
 
-#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
 msgid ""
 "Please select exactly two or three nodes or one way with exactly two or "
@@ -735,20 +754,20 @@
 #: ../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:285
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:877
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:307
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1067
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:200
-#: ../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
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:204
 #: ../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:674
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:91
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:87
 msgid "Delete"
 msgstr "Smazat"
@@ -758,85 +777,86 @@
 msgstr "Smazat označené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:63
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:37
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:39
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:222
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:194
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:64
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:221
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:55
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:193
 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:32
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:132
 msgid "Distribute Nodes"
 msgstr "Rozdělit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:30
 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:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 msgid "Download map data from the OSM server."
 msgstr "Stáhnout data z OSM serveru"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 #: ../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:26
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
 #, java-format
 msgid "File: {0}"
 msgstr "Soubor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
 msgid "Download"
 msgstr "Stáhnout"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
 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/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
 msgid "Download referrers from OSM..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:37
 msgid "Download primitives referring to one of the selected primitives"
 msgstr "Stáhnout prvky odkazující na jeden z vybraných prvků"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
 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:1558
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:122
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
 #, 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
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:125
 msgid "Conflicts during download"
 msgstr "Konflikty během stahování"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:145
 #, java-format
 msgid "({0}/{1}) Loading parents of primitive {2}"
@@ -845,6 +865,6 @@
 #: ../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/RelationListDialog.java:378
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
 msgid "Duplicate"
 msgstr "Duplikovat"
@@ -868,28 +888,33 @@
 msgstr "Ukončit JOSM"
 
+#: ../core/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:202
+#, fuzzy
+msgid "All Formats"
+msgstr "Všechny obrázky"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:214
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:209
 msgid "Export to GPX..."
 msgstr "Exportovat do GPX..."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:213
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:208
 msgid "Export the data to GPX file."
 msgstr "Exportovat data do GPX souboru."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:48
 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:71
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:56
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:61
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:70
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
 #, java-format
 msgid "paramenter ''{0}'' must not be null"
 msgstr "parametr ''{0}'' nesmí být null"
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:73
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:58
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:72
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:57
 #, java-format
 msgid "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
@@ -898,57 +923,58 @@
 "''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:74
 msgid "Export GPX file"
 msgstr "Export GPX souboru"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:49
 msgid "JOSM Online Help"
 msgstr "JOSM Online Nápověda"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:90
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:108
 msgid "Open in Browser"
 msgstr "Otevřít v prohlížeči"
 
-#: ../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:595
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:266
-#: ../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
+#: ../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:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
 #: ../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:634
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:92
-#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:110
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:123
 #: ../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:115
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:114
 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:200
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:199
 #, 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:219
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:218
 #, 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:224
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:223
 #, java-format
 msgid ""
@@ -1002,22 +1028,26 @@
 msgstr "Sloučit aktuální vrstvu do jiné vrstvy"
 
+#: ../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:78
+#: ../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:159
+#: ../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:160
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+msgid "Merge Anyway"
+msgstr "Přesto sloučit"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
 msgid ""
 "The selected nodes have differing relation memberships.  Do you still want "
@@ -1026,77 +1056,73 @@
 "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:162
-msgid "Merge Anyway"
-msgstr "Přesto sloučit"
-
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:258
 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:297
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:301
 #, java-format
 msgid "Merge {0} nodes"
 msgstr "Spojit {0} uzly"
 
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:21
 msgid "Merge selection"
 msgstr "Sloučit výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
 msgid "Merge the currently selected primitives into another layer"
 msgstr "Sloučit vybrané prvky do jiné vrstvy"
 
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 #: ../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:76
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:75
 msgid "Mirror"
 msgstr "Zrcadlit"
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
 msgid "Mirror selected nodes and ways."
 msgstr "Zrcadlit vybrané body a cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:53
 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:37
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:36
 msgid "up"
 msgstr "nahoru"
 
-#: ../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
+#: ../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
 #, java-format
 msgid "Move objects {0}"
 msgstr "Přesunout objekty {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:39
 msgid "down"
 msgstr "dolů"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:42
 msgid "left"
 msgstr "vlevo"
 
 #. dir == Direction.RIGHT) {
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:45
 msgid "right"
 msgstr "vpravo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:55
 #, java-format
 msgid "Move {0}"
 msgstr "Přesunout {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
 #, java-format
 msgid "Moves Objects {0}"
 msgstr "Přesunutí objektů {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 msgid "Cannot move objects outside of the world."
 msgstr "Nemohu přesouvat objekty mimo svět."
@@ -1104,5 +1130,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:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
 msgid "New"
 msgstr "Nový"
@@ -1112,17 +1138,22 @@
 msgstr "Vytvořit novou mapu"
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:36
 msgid "Open..."
 msgstr "Otevřít..."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:35
 msgid "Open a file."
 msgstr "Otevřít soubor."
 
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:59
-#, java-format
-msgid "<html>Could not read file ''{0}''. Error is: <br>{1}</html>"
-msgstr "<html>Nemohu přečíst soubor ''{0}''. Chyba je: <br>{1}</html>"
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:65
+#, fuzzy
+msgid "Opening files"
+msgstr "Otevřít soubor."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:84
+#, fuzzy, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr "Neznámá role ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:32
@@ -1160,21 +1191,17 @@
 msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:62
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:63
 msgid "Only two nodes allowed"
 msgstr "Povoleny pouze dva uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
 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:87
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:88
 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: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:119
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:122
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1183,9 +1210,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
 msgid "Only one node selected"
 msgstr "Vybrán pouze jeden uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:283
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:321
 msgid "Orthogonalize"
 msgstr "Ortogonalizovat"
@@ -1201,13 +1228,28 @@
 msgstr "Vložit ze schránky"
 
-#: ../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:74
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:35
 msgid "Paste Tags"
 msgstr "Vložit Popisky"
 
-#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:28
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
 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."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:116
+#, fuzzy, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] "Nahrávám {0}"
+msgstr[1] "Nahrávám {0}"
+msgstr[2] "Nahrávám {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:117
+#, fuzzy, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] "Obnovit {0} prvků"
+msgstr[1] "Obnovit {0} prvků"
+msgstr[2] "Obnovit {0} prvků"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
@@ -1233,37 +1275,32 @@
 msgstr "Vrátit zpět poslední vrácenou akci"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:64
 msgid "Rename layer"
 msgstr "Přejmenovat vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:46
 msgid "Also rename the file"
 msgstr "Také přejmenovat soubor"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:92
 #, java-format
 msgid "Could not rename file ''{0}''"
 msgstr "Nemohu přejmenovat soubor ''{0}''"
 
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
 msgid "Reverse Ways"
 msgstr "Otočit cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
 msgid "Reverse the direction of all selected ways."
 msgstr "Otočit směr všech zvolených cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:49
 msgid "Please select at least one way."
 msgstr "Zvolte minimálně jednu cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:79
 msgid "Reverse ways"
 msgstr "Otočit cesty"
@@ -1271,10 +1308,11 @@
 #: ../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
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:63
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:178
 msgid "Save"
 msgstr "Uložit"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:27
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:182
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:177
 msgid "Save the current data."
 msgstr "Uložit aktuální data."
@@ -1285,36 +1323,25 @@
 msgstr "Soubor {0} již existuje. Přepsat ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:69
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 msgid "No Exporter found! Nothing saved."
 msgstr "Nenalezen žádný exportér! Nic nebylo uloženo."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:94
-msgid ""
-"Internal Error: cannot check conditions for no layer. Please report this as "
-"a bug."
-msgstr ""
-"Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako chybu."
-
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
-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:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
 msgid "Empty document"
 msgstr "Prázdný dokument"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
 msgid "The document contains no data."
 msgstr "Dokument neobsahuje žádná data."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:110
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:93
 msgid "Save anyway"
 msgstr "Přesto uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:118
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:101
 msgid "Conflicts"
 msgstr "Konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:119
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:102
 msgid ""
 "There are unresolved conflicts. Conflicts will not be saved and handled as "
@@ -1324,28 +1351,28 @@
 "vyřešeny, jako by byly všechny odmítnuty. Pokračovat?"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:120
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:103
 msgid "Reject Conflicts and Save"
 msgstr "Zamítnout konflikty a uložit"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:131
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:114
 msgid "Save OSM file"
 msgstr "Uložit OSM soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:133
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:116
 msgid "Save GPX file"
 msgstr "Uložit GPX soubor"
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:134
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:117
 msgid "Save Layer"
 msgstr "Ulož vrstvu"
 
+#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:194
 msgid "Save As..."
 msgstr "Uložit jako..."
 
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:198
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:24
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:193
 msgid "Save the current data to a new file."
 msgstr "Uložit aktuální data do nového souboru"
@@ -1380,33 +1407,33 @@
 msgstr "Nápověda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Status Report"
 msgstr "Zpráva o stavu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
 msgid "Copy to clipboard and close"
 msgstr "Zkopírovat do schránky a zavřít"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:100
-#: ../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
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:245
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
 msgid "Close"
 msgstr "Zavřít"
 
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:54
 msgid "Split Way"
 msgstr "Rozdělit cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:52
 msgid "Split a way at the selected node."
 msgstr "Rozdělit cestu zvoleným uzlem"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:69
 msgid "The current selection cannot be used for splitting."
 msgstr "Tento výběr nemůže být použit k rozdělení."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:125
 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."
@@ -1415,5 +1442,5 @@
 msgstr[2] "Zvolené uzly nejsou uprostřed žádné cesty."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:137
 msgid ""
 "There is more than one way using the node you selected. Please select the "
@@ -1426,9 +1453,9 @@
 msgstr[2] "Více než jedna cesta obsahuje vybrané uzly. Vyberte také cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:150
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:165
 msgid "The selected way does not contain the selected node."
 msgid_plural "The selected way does not contain all the selected nodes."
@@ -1437,10 +1464,10 @@
 msgstr[2] "Označené cesty neobsahují vybrané uzly."
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:237
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:251
 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:258
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:257
 msgid ""
 "The way cannot be split at the selected nodes. (Hint: Select nodes in the "
@@ -1450,5 +1477,5 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:345
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1456,5 +1483,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1462,8 +1489,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:358
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
 #, java-format
 msgid "Split way {0} into {1} parts"
 msgstr "Rozdělit cestu {0} do {1} částí"
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
+#, fuzzy
+msgid "Close current changeset"
+msgstr "Zavírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
+#, fuzzy
+msgid "Close the current changeset ..."
+msgstr "Zavírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
+msgid "There is currently no changeset open."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
+#, fuzzy
+msgid "No open changeset"
+msgstr "Otevírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
+#, fuzzy
+msgid "Closing changeset"
+msgstr "Zavírám sadu změn..."
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
@@ -1481,47 +1533,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:52
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:51
 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:83
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
 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:108
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:107
 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:110
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:109
 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:119
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
 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:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
 msgid "* One tagged node, or"
 msgstr "* Jeden otagovaný uzel, nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 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:123
+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: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:125
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1530,5 +1582,5 @@
 "nebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:125
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1537,5 +1589,5 @@
 "cestě."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:127
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1548,9 +1600,9 @@
 "své vlastní kopie a všechny uzly budou vybrány."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:170
 msgid "Unglued Node"
 msgstr "Nespojený uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:388
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:387
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1558,5 +1610,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:412
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:411
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1600,61 +1652,71 @@
 msgstr "Aktualizuje data v aktuální vrstvě ze serveru (znovu stáhne data)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
+msgid "Updating data"
+msgstr "Aktualizuji data"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
 msgid "No current dataset found"
 msgstr "Nenalezena aktuální datová sada"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
 msgid "Didn't find a primitive with id {0} in the current dataset"
 msgstr "Prvek s id {0} nebyl v aktuální datové sadě nalezen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:92
 msgid "Update Selection"
 msgstr "Aktualizovat výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:90
 msgid "Updates the currently selected primitives from the server"
 msgstr "Aktualizovat právě vybrané prvky ze serveru"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
 msgid "There are no selected primitives to update."
 msgstr "Nejsou vybrány žádné prvky pro aktualizaci."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "Selection empty"
 msgstr "Prázdný výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:103
 msgid "Upload to OSM..."
 msgstr "Nahrát do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
 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:116
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, fuzzy, java-format
+msgid ""
+"<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
+"resolve them first.<html>"
+msgstr "Jsou zde nevyřešené konflikty. Musíte je nejprve vyřešit."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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: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:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Žádné změny k nahrání."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:210
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronizovat pouze {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:211
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovat celý dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:215
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1675,17 +1737,17 @@
 "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
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Detekován konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:243
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:281
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, 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:258
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1701,32 +1763,70 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:309
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:347
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:380
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:396
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:389
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:405
 msgid "Upload to OSM API failed"
 msgstr "Nahrándí do OSM API selhalo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:411
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:427
 msgid "Updating primitive"
 msgstr "Aktualizuji prvky"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:449
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:474
+msgid "Upload these changes?"
+msgstr "Nahrát tyto úpravy?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:475
+msgid "Upload Changes"
+msgstr "Nahrát změny na server"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:527
+#, fuzzy, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr "Upravit novou relaci ve vrstvě \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:651
+msgid "Use a new changeset and close it"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:652
+msgid ""
+"Select to upload the data using a new changeset and to close the changeset "
+"after the upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:655
+msgid "Use a new changeset and leave it open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:656
+msgid ""
+"Select to upload the data using a new changeset and to leave the changeset "
+"open after the upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:658
+#, fuzzy
+msgid "Upload to a new or to an existing changeset?"
+msgstr "Přidat nový uzel do již existující cesty"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:680
 msgid "upload all changes in one request"
 msgstr "Nahrát všechny změny v jednom požadavku"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:450
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:681
 msgid ""
 "Enable to upload all changes in one request, disable to use one request per "
@@ -1736,31 +1836,83 @@
 "prvku samostatně"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:464
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:698
+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:731
+#, fuzzy
+msgid "Settings"
+msgstr "Nastavení mapy"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:732
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:936
+#, fuzzy
+msgid "Tags of new changeset"
+msgstr "sada změn"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:755
 msgid "Objects to add:"
 msgstr "Objekty k přidání:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:761
 msgid "Objects to modify:"
 msgstr "Objekty ke změnění:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:480
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:767
 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/UploadAction.java:803
+#, fuzzy, java-format
+msgid "{0} object to add:"
+msgid_plural "{0} objects to add:"
+msgstr[0] "Objekty k přidání:"
+msgstr[1] "Objekty k přidání:"
+msgstr[2] "Objekty k přidání:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:812
+#, fuzzy, java-format
+msgid "{0} object to modifiy:"
+msgid_plural "{0} objects to modify:"
+msgstr[0] "Objekty ke změnění:"
+msgstr[1] "Objekty ke změnění:"
+msgstr[2] "Objekty ke změnění:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:821
+#, fuzzy, java-format
+msgid "{0} object to delete:"
+msgid_plural "{0} objects to delete:"
+msgstr[0] "Objekty ke smazání:"
+msgstr[1] "Objekty ke smazání:"
+msgstr[2] "Objekty ke smazání:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:910
+#, java-format
+msgid "Use the existing changeset {0} and close it after upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:911
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to close the changeset "
+"after this upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:914
+#, java-format
+msgid "Use the existing changeset {0} and leave it open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:915
+#, java-format
+msgid ""
+"Select to upload to the existing changeset {0} and to leave the changeset "
+"open for further uploads"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:942
+#, fuzzy, java-format
+msgid "Tags of changeset {0}"
+msgstr "Poslední změna v {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -1784,20 +1936,20 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
 #, java-format
 msgid "Audio: {0}"
 msgstr "Zvuk: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
 msgid "Faster"
 msgstr "Rychleji"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:12
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:13
 msgid "Faster Forward"
 msgstr "Rychle vpřed"
@@ -1839,10 +1991,10 @@
 msgstr "Přehrát předchozí značku"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
 msgid "Slower"
 msgstr "Pomaleji"
 
-#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:12
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:13
 msgid "Slower Forward"
 msgstr "Zpomalené přehrávání"
@@ -1871,31 +2023,27 @@
 "ignoruji vyjímku, protože stahování bylo stornování. Vyjímka byla : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:116
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:119
 msgid "No data imported."
 msgstr "Nic nebylo importováno"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:147
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:150
 msgid "OpenStreetMap data"
 msgstr "OpenStreetMap data"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:60
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:59
 #, 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:78
-msgid "Updating data"
-msgstr "Aktualizuji data"
-
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:109
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:108
 #, java-format
 msgid "The following errors occurred during mass download:{0}"
 msgstr "Během hromadného stahování došlo k následujícím chybám:{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:111
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:110
 msgid "Errors during Download"
 msgstr "Chyby při stahování"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:176
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:175
 #, java-format
 msgid ""
@@ -1912,20 +2060,20 @@
 "serveru.<br>Klikněte <strong>{2}</strong> pro ignorování.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:192
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:191
 msgid "Deleted or moved primitives"
 msgstr "Smazané nebo přesunuté prvky"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:92
 msgid "Delete Mode"
 msgstr "Režim mazání"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
 msgid "Delete nodes or ways."
 msgstr "Smaž body nebo cesty"
 
-#: ../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/DeleteAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:48
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
@@ -1934,5 +2082,5 @@
 msgstr "Režim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:270
 msgid ""
 "Click to delete. Shift: delete way segment. Alt: don't delete unused nodes "
@@ -1942,55 +2090,69 @@
 "když mažete trasu. CTRL: smazat referenční objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../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/data/osm/history/RelationMember.java:31
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:298
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:313
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:435
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:482
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:537
-#: ../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/conflict/pair/properties/PropertiesMergeModel.java:297
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:312
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:51
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:99
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:287
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:79
 #: ../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
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:165
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:177
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:196
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:239
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:70
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java:33
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:142
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:154
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:166
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:197
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:42
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:60
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:69
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:75
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:78
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java:31
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:38
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:51
+#: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #: ../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
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
 #, 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:93
 #: ../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
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
 msgid "Draw"
 msgstr "Kreslit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 msgid "Draw nodes"
 msgstr "Kreslit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:214
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:83
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
@@ -1998,38 +2160,38 @@
 msgstr "vybráno"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:358
 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:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:530
 msgid "Add node"
 msgstr "Přidat uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:532
 msgid "Add node into way"
 msgstr "Přidat uzel do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:540
 msgid "Connect existing way to node"
 msgstr "Spojit existující cestu do uzlu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:542
 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:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:544
 msgid "Add node into way and connect"
 msgstr "Přidat uzel do cesty a spojit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:931
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
 msgid "Create new node."
 msgstr "Vytvořit nový uzel."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:960
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
 msgid "Select node under cursor."
 msgstr "Vybrat uzel pod kurzorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
 #, java-format
 msgid "Insert new node into way."
@@ -2039,14 +2201,14 @@
 msgstr[2] "Vložit nový uzel do {0} cest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:948
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
 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:950
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Continue way from last node."
 msgstr "Pokračovat v cestě od posledního uzlu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:962
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:973
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
 msgid "Finish drawing."
 msgstr "Dokončit kreslení"
@@ -2066,5 +2228,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 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"
@@ -2075,5 +2237,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusť myší tlačítko k zastavení otaáčení"
@@ -2089,17 +2251,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../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:117
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:95
 msgid "Select"
 msgstr "Vybrat"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Zvol, posuň a otáčej objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2109,13 +2272,21 @@
 msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 msgid "Move elements"
 msgstr "Přesun prvků"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
-#, java-format
-msgid ""
-"You did move more than {0} elements. Moving a large number of elements is "
-"often an error.\n"
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+msgid "Move them"
+msgstr "Přesunout je"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+msgid "Undo move"
+msgstr "Vrátit zpět přesun"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#, fuzzy, java-format
+msgid ""
+"You moved more than {0} elements. Moving a large number of elements is often "
+"an error.\n"
 "Really move them?"
 msgstr ""
@@ -2124,13 +2295,9 @@
 "Opravdu je chcete přesunout?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-msgid "Move them"
-msgstr "Přesunout je"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
-msgid "Undo move"
-msgstr "Vrátit zpět přesun"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476
+msgid "Always move and don't show dialog again"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2138,5 +2305,5 @@
 "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:547
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:553
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2163,62 +2330,62 @@
 "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/actions/search/SearchAction.java:43
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:46
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Hledat..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Hledat objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
 msgid "Can't search because there is no loaded data."
 msgstr "Nelze hledat jelikož nejsou nahrána žádná data."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
 msgid "Please enter a search string."
 msgstr "Zadjte hledaný řetězec."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
 msgid "replace selection"
 msgstr "nahradit označené"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
 msgid "add to selection"
 msgstr "přidat k výběru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "remove from selection"
 msgstr "odebrat z výběru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
 msgid "case sensitive"
 msgstr "velikost písmen rozhoduje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
 msgid "regular expression"
 msgstr "regulární výraz"
 
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+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: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."
+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: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:95
+msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
+msgstr ""
+
 #: ../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>, "
@@ -2226,112 +2393,113 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<u>Special targets:</u>"
 msgstr "<u>Speciální cíle:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 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:102
+#, fuzzy
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
+msgstr "<b>id:</b>... - objekt s daným ID"
+
 #: ../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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 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:108
+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: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"
+"<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: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:111
+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: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/actions/search/SearchAction.java:122
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Hledat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
 msgid "Start Search"
 msgstr "Začít hledání"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
 #, 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
 #, 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
 #, 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
 #, java-format
 msgid "Found {0} matches"
 msgstr "Nalezeno {0} odpovídajích výrazů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:237
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:238
 msgid "RX"
 msgstr "RX"
@@ -2397,58 +2565,96 @@
 msgstr "Neplatná hodnota pro operátor id: {0}. Je očekáváno číslo."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:35
+#: ../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:46
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:45
 #, java-format
 msgid "Contact {0}..."
 msgstr "Kontakt {0}..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:48
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:47
 msgid "Downloading..."
 msgstr "Stahuji..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
-#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:81
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:63
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:80
 #, 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:83
 #, 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
+#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:87
 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}"
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
+#, fuzzy, java-format
+msgid "Add node {0}"
+msgstr "Přidat uzel"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
+#, fuzzy, java-format
+msgid "Add way {0}"
 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}''"
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
+#, fuzzy, java-format
+msgid "Add relation {0}"
+msgstr "Relace: {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
+#, fuzzy, java-format
+msgid "Change node {0}"
+msgstr "Sada změn {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
+#, fuzzy, java-format
+msgid "Change way {0}"
+msgstr "Sada změn {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
+#, fuzzy, java-format
+msgid "Change relation {0}"
+msgstr "Změnit relaci"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#, fuzzy, java-format
+msgid "Remove \"{0}\" for node ''{1}''"
 msgstr "Odstraněno \"{0}\" pro {1} ''{2}''"
 
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, fuzzy, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+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}''"
+#, fuzzy, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr "Odstraněno \"{0}\" pro {1} ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#, fuzzy, java-format
+msgid "Set {0}={1} for node ''{2}''"
 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
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#, fuzzy, java-format
+msgid "Set {0}={1} for way ''{2}''"
+msgstr "Nastaveno {0}={1} pro {2} ''{3}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
+#, fuzzy, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr "Nastaveno {0}={1} pro {2} ''{3}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:65
 msgid "object"
@@ -2458,10 +2664,10 @@
 msgstr[2] "objekty"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:114
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
 #, java-format
 msgid "Remove \"{0}\" for {1} {2}"
 msgstr "Odstraněno \"{0}\" pro {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:115
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
 #, java-format
 msgid "Set {0}={1} for {2} {3}"
@@ -2473,5 +2679,5 @@
 msgstr "Změnit roli člena relace {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:34
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
 #, java-format
 msgid ""
@@ -2480,10 +2686,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:40
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1180
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
 msgid "Double conflict"
 msgstr "Dvojí konflikt"
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:56
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
 #, java-format
 msgid ""
@@ -2494,5 +2700,5 @@
 "''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:72
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
 #, java-format
 msgid "Add conflict for ''{0}''"
@@ -2516,44 +2722,64 @@
 msgstr "nemohu vyřešit nerozhodnutý konflikt"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:127
+#, fuzzy, java-format
+msgid "Delete {0} object"
+msgid_plural "Delete {0} objects"
+msgstr[0] "Smazat {0} {1}"
+msgstr[1] "Smazat {0} {1}"
+msgstr[2] "Smazat {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
+#, fuzzy, java-format
+msgid "Delete {0} node"
+msgid_plural "Delete {0} nodes"
+msgstr[0] "Režim mazání"
+msgstr[1] "Režim mazání"
+msgstr[2] "Režim mazání"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
+#, fuzzy, java-format
+msgid "Delete {0} way"
+msgid_plural "Delete {0} ways"
+msgstr[0] "Smazat {0} {1}"
+msgstr[1] "Smazat {0} {1}"
+msgstr[2] "Smazat {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
+#, fuzzy, java-format
+msgid "Delete {0} relation"
+msgid_plural "Delete {0} relations"
+msgstr[0] "Odstranit z relace"
+msgstr[1] "Odstranit z relace"
+msgstr[2] "Odstranit z relace"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
 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?"
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
+msgid "Delete from relation"
+msgstr "Odstranit z relace"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:202
+#, fuzzy, java-format
+msgid ""
+"<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}.<br>Delete "
+"from relation?</html>"
 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:852
-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?"
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213
+#, fuzzy, java-format
+msgid ""
+"<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from relation?"
+"</html>"
 msgstr ""
 "Výběr \"{0}\" je používán v relaci \"{1}\".\n"
 "Smazat z relace?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:400
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446
 msgid "Split way segment"
 msgstr "Rozdělit segment cesty"
@@ -2561,6 +2787,6 @@
 #. leave message in one tr() as there is a grammatical
 #. connection.
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:424
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:127
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:470
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:141
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -2572,5 +2798,5 @@
 "<br>Opravdu je chcete smazat?"
 
-#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:432
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:478
 msgid "Delete confirmation"
 msgstr "Potvrďte smazání"
@@ -2581,5 +2807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:117
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116
 #, java-format
 msgid "Move {0} node"
@@ -2617,10 +2843,20 @@
 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
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:69
+#, java-format
+msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
+#, java-format
+msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
+#, java-format
+msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
 #, java-format
 msgid "Rotate {0} node"
@@ -2634,17 +2870,37 @@
 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
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
+#, fuzzy, java-format
+msgid "Resolve {0} tag conflicts in node {1}"
+msgstr "Vyřešit {0} konfliktů v {1} objektech"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
+#, fuzzy, java-format
+msgid "Resolve {0} tag conflicts in way {1}"
+msgstr "Vyřešit {0} konfliktů v {1} objektech"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
+#, fuzzy, java-format
+msgid "Resolve {0} tag conflicts in relation {1}"
+msgstr "Vyřešit {0} konfliktů v {1} objektech"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
 #, 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}"
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#, fuzzy, java-format
+msgid "Resolve version conflicts for node {0}"
+msgstr "Vyřešte konflikt verzí mezi {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
+#, fuzzy, java-format
+msgid "Resolve version conflicts for way {0}"
+msgstr "Vyřešte konflikt verzí mezi {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
+#, fuzzy, java-format
+msgid "Resolve version conflicts for relation {0}"
 msgstr "Vyřešte konflikt verzí mezi {0} {1}"
 
@@ -2671,13 +2927,13 @@
 "jejích bodů, z důvodů udržení konzistence dat?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:27
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
 msgid "Relation"
 msgstr "Vztah"
 
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
 msgid "Old role"
 msgstr "Stará role"
 
-#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:31
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
 msgid "New role"
 msgstr "Nová role"
@@ -2696,62 +2952,119 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:232
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
 msgid "New value"
 msgstr "Nová hodnota"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:41
 msgid "Apply selected changes"
 msgstr "Použít zvolené změny"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:44
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
 msgid "Don't apply changes"
 msgstr "Neprovádět změny"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:87
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:85
 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
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:97
 msgid "Properties of "
 msgstr "Vlastnosti "
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:125
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:123
 msgid "Roles in relations referring to"
 msgstr "Role v relaci odkazující na"
 
-#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:146
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:144
 msgid "Automatic tag correction"
 msgstr "Automatická korekce popisků"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:327
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:263
+#, java-format
+msgid "Warning: failed to persist preferences to ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
 #, 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}."
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:377
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Preference directory ''{0}'' "
+"isn't a directory."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' "
+"isn't a directory.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Failed to create missing "
+"preference directory: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to create missing "
+"preference directory: {0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#, java-format
+msgid ""
+"Warning: Missing preference file ''{0}''. Creating a default preference file."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
+#, java-format
+msgid ""
+"Warning: Replacing existing preference file ''{0}'' with default preference "
+"file."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to reset preference file "
+"to default: {0}</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#, fuzzy, java-format
+msgid ""
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
 msgstr "Soubor s nastavením má chyby. Vytvářím zálohu starého do {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences.Failed to reset preference file to "
+"default: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Předvolby uloženy na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
 #, 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
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:111
 msgid "Could not load preferences from server."
 msgstr "Nemohu nahrát předvolby ze serveru."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:218
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:217
 #, java-format
 msgid ""
@@ -2765,29 +3078,36 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:31
+#. *
+#. * the decimal format 999.999
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
 msgid "Decimal Degrees"
 msgstr "Desetinné stupně"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:32
+#. *
+#. * the minutes/seconds format 99" 99'
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
 msgid "Degrees Minutes Seconds"
 msgstr "Stupně minuty sekundy"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
 msgid "S"
 msgstr "J"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:62
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:55
 msgid "N"
 msgstr "S"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
 msgid "W"
 msgstr "Z"
 
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:74
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
 msgid "E"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:37
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:44
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
 #, java-format
 msgid "Changeset {0}"
@@ -2799,15 +3119,232 @@
 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:170
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:186
-msgid "incomplete"
-msgstr "nekompletní"
-
-#: ../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/OsmPrimitive.java:44
+#, java-format
+msgid "Error: {0}"
+msgstr "Chyba: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:44
+#, java-format
+msgid "Warning: {0}"
+msgstr "Varování: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:202
+msgid "a primitive with id=0 can't be invisible"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#, java-format
+msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#, java-format
+msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:571
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:605
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:623
+msgid ""
+"tag collection can't be applied to a primitive because there are keys with "
+"multiple values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
+msgid "There's no primitive with version {0} in this history"
+msgstr "V historii není žádný prvek s verzí {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:161
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:163
+msgid "There's no version valid at date ''{0}'' in this history"
+msgstr "V historii není žádná verze platná k datu ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:174
+#, java-format
+msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
+msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
+msgid "no earliest version found. History is empty."
+msgstr "nenalezena starší verze. Historie je prázdná."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:186
+msgid "no latest version found. History is empty."
+msgstr "nenalezena novější verze. Historie je prázdná."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
+msgid "Didn't find an  primitive with id {0} in this dataset"
+msgstr "V této datové sadě nelze nalézt prvek s id {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:84
+msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
+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
+#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:34
+#, java-format
+msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
+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 "nelze porovnat prvky s id ''{0}'' a id ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#, java-format
+msgid "parameter {0} not in range 0..{1}, got {2}"
+msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:246
+msgid "Area style way is not closed."
+msgstr "Cesta se stylem plochy není uzavřená."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:477
+#, java-format
+msgid "multipolygon way ''{0}'' is not closed."
+msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
+
+#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
+#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:581
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:835
+msgid "Empty member in relation."
+msgstr "Prázdný prvek v relaci."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:583
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:837
+#, java-format
+msgid "Deleted member ''{0}'' in relation."
+msgstr "Odstraněn prvek ''{0}'' z relace."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:594
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:848
+#, java-format
+msgid "Way ''{0}'' with less than two points."
+msgstr "Cesta ''{0}'' s méně, než dvěmi body."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+msgid "More than one \"from\" way found."
+msgstr "Nalezena více než jedna \"from\" cesta."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
+msgid "More than one \"to\" way found."
+msgstr "Nalezeno více cílových \"to\" cest."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:611
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:625
+msgid "More than one \"via\" found."
+msgstr "Nalezen více než jeden \"via\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr "Neznámá role ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:633
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr "Neznámý typ prvku pro ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:639
+msgid "No \"from\" way found."
+msgstr "Nenazezena příchozí cesta \"from\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:643
+msgid "No \"to\" way found."
+msgstr "Nenalezena odchozí cesta \"to\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:647
+msgid "No \"via\" node or way found."
+msgstr "Nenalezen \"via\" uzel nebo cesta."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:656
+msgid "The \"from\" way doesn't start or end at a \"via\" node."
+msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:660
+msgid "The \"to\" way doesn't start or end at a \"via\" node."
+msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:673
+msgid "The \"from\" way doesn't start or end at the \"via\" way."
+msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:677
+msgid "The \"to\" way doesn't start or end at the \"via\" way."
+msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
+#, java-format
+msgid "Style for restriction {0} not found."
+msgstr "Styl pro omezení {0} nenalezen."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
+#, java-format
+msgid "No useful role ''{0}'' for Way ''{1}''."
+msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
+#, java-format
+msgid "Non-Way ''{0}'' in multipolygon."
+msgstr "Ne-cesta ''{0}'' v multipolygonu."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:927
+#, java-format
+msgid "No outer way for multipolygon ''{0}''."
+msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1016
+#, java-format
+msgid "Intersection between ways ''{0}'' and ''{1}''."
+msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1028
+#, java-format
+msgid "Inner way ''{0}'' is outside."
+msgstr "Vnitřní cesta ''{0}'' je venku."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1081
+#, java-format
+msgid "Style for inner way ''{0}'' equals multipolygon."
+msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1107
+#, java-format
+msgid "Style for outer way ''{0}'' mismatches."
+msgstr "Styl pro vnější cestu ''{0}'' nesedí."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1311
+msgid "untagged"
+msgstr "nepopsaný"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1312
+msgid "text"
+msgstr "text"
+
+#. should not happen
+#.
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
+#, java-format
+msgid ""
+"My primitive with id {0} and version {1} is visible although their primitive "
+"with lower version {2} is not visible. Can't deal with this inconsistency. "
+"Keeping my primitive. "
+msgstr ""
+"Můj prvek s id {0} a verzí {1} je viditelný přesto, že cizí prvek s nižší "
+"verzí {2} viditelný není. Tuto inkonzistenci nelze vyřešit. Ponechávám můj "
+"prvek. "
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
+msgid "inactive"
+msgstr "neaktivní"
+
 #: ../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
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:49
 msgid "node"
@@ -2817,22 +3354,7 @@
 msgstr[2] "uzly"
 
-#: ../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:43
-#, java-format
-msgid "Warning: {0}"
-msgstr "Varování: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
-msgid "nodes"
-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:241
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:61
 msgid "way"
@@ -2842,12 +3364,7 @@
 msgstr[2] "cestami"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
-msgid "ways"
-msgstr "cesty"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:174
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
 msgid "relation"
@@ -2857,251 +3374,4 @@
 msgstr[2] "relace"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
-msgid "relations"
-msgstr "vazby"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
-msgid "changeset"
-msgstr "sada změn"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
-msgid "changesets"
-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:52
-#, java-format
-msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:193
-#, java-format
-msgid "{0} member"
-msgid_plural "{0} members"
-msgstr[0] "{0} prvek"
-msgstr[1] "{0} prvky"
-msgstr[2] "{0} prvků"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:194
-msgid "highway"
-msgstr "silnice"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:195
-#: build/trans_presets.java:3013
-msgid "railway"
-msgstr "železnice"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:196
-msgid "waterway"
-msgstr "vodní tok"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:197
-msgid "landuse"
-msgstr "využití oblasti (landuse)"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:201
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
-#, java-format
-msgid "{0} node"
-msgid_plural "{0} nodes"
-msgstr[0] "{0} uzel"
-msgstr[1] "{0} uzly"
-msgstr[2] "{0} uzlů"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153
-msgid "There's no primitive with version {0} in this history"
-msgstr "V historii není žádný prvek s verzí {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162
-msgid "There's no version valid at date ''{0}'' in this history"
-msgstr "V historii není žádná verze platná k datu ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173
-#, java-format
-msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
-msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
-msgid "no earliest version found. History is empty."
-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 "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 "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 "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
-#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:33
-#, java-format
-msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
-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 "nelze porovnat prvky s id ''{0}'' a id ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
-#, java-format
-msgid "parameter {0} not in range 0..{1}, got {2}"
-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á."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:438
-#, java-format
-msgid "multipolygon way ''{0}'' is not closed."
-msgstr "Cesta v multipolygonu ''{0}'' není uzavřena."
-
-#. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
-#. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:539
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:787
-msgid "Empty member in relation."
-msgstr "Prázdný prvek v relaci."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:541
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:789
-#, java-format
-msgid "Deleted member ''{0}'' in relation."
-msgstr "Odstraněn prvek ''{0}'' z relace."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:554
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:800
-#, java-format
-msgid "Way ''{0}'' with less than two points."
-msgstr "Cesta ''{0}'' s méně, než dvěmi body."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:559
-msgid "More than one \"from\" way found."
-msgstr "Nalezena více než jedna \"from\" cesta."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:565
-msgid "More than one \"to\" way found."
-msgstr "Nalezeno více cílových \"to\" cest."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:571
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-msgid "More than one \"via\" found."
-msgstr "Nalezen více než jeden \"via\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:576
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:589
-#, java-format
-msgid "Unknown role ''{0}''."
-msgstr "Neznámá role ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:592
-#, java-format
-msgid "Unknown member type for ''{0}''."
-msgstr "Neznámý typ prvku pro ''{0}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:597
-msgid "No \"from\" way found."
-msgstr "Nenazezena příchozí cesta \"from\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:601
-msgid "No \"to\" way found."
-msgstr "Nenalezena odchozí cesta \"to\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:605
-msgid "No \"via\" node or way found."
-msgstr "Nenalezen \"via\" uzel nebo cesta."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:614
-msgid "The \"from\" way doesn't start or end at a \"via\" node."
-msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:618
-msgid "The \"to\" way doesn't start or end at a \"via\" node."
-msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
-msgid "The \"from\" way doesn't start or end at the \"via\" way."
-msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
-msgid "The \"to\" way doesn't start or end at the \"via\" way."
-msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:752
-#, java-format
-msgid "Style for restriction {0} not found."
-msgstr "Styl pro omezení {0} nenalezen."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:809
-#, java-format
-msgid "No useful role ''{0}'' for Way ''{1}''."
-msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
-#, java-format
-msgid "Non-Way ''{0}'' in multipolygon."
-msgstr "Ne-cesta ''{0}'' v multipolygonu."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:869
-#, java-format
-msgid "No outer way for multipolygon ''{0}''."
-msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:955
-#, java-format
-msgid "Intersection between ways ''{0}'' and ''{1}''."
-msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:966
-#, java-format
-msgid "Inner way ''{0}'' is outside."
-msgstr "Vnitřní cesta ''{0}'' je venku."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1017
-#, java-format
-msgid "Style for inner way ''{0}'' equals multipolygon."
-msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1042
-#, java-format
-msgid "Style for outer way ''{0}'' mismatches."
-msgstr "Styl pro vnější cestu ''{0}'' nesedí."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1239
-msgid "untagged"
-msgstr "nepopsaný"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1240
-msgid "text"
-msgstr "text"
-
-#. should not happen
-#.
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:242
-#, java-format
-msgid ""
-"My primitive with id {0} and version {1} is visible although their primitive "
-"with lower version {2} is not visible. Can't deal with this inconsistency. "
-"Keeping my primitive. "
-msgstr ""
-"Můj prvek s id {0} a verzí {1} je viditelný přesto, že cizí prvek s nižší "
-"verzí {2} viditelný není. Tuto inkonzistenci nelze vyřešit. Ponechávám můj "
-"prvek. "
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
-msgid "inactive"
-msgstr "neaktivní"
-
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
 msgid "untagged way"
@@ -3114,5 +3384,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:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:167
 msgid "background"
 msgstr "pozadí"
@@ -3122,5 +3392,5 @@
 msgstr "zvýraznit"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:27
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
 msgid "WGS84 Geographic"
 msgstr "WGS84 Geographic"
@@ -3130,5 +3400,5 @@
 msgstr "Gauss-Laborde Réunion 1947"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:111
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:110
 msgid ""
 "IMPORTANT : data positioned far away from\n"
@@ -3145,21 +3415,21 @@
 "kartografické projekce.."
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:144
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:143
 msgid "Lambert Zone (France)"
 msgstr "Lambertova zóna (Francie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:98
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertova zóna (Estonsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:38
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
 msgid "Mercator"
 msgstr "Mercatorova projekce"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:92
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:90
 msgid "Swiss Grid (Switzerland)"
 msgstr "Švýcarský Grid"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:339
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:338
 #, java-format
 msgid "UTM Zone {0}"
@@ -3179,9 +3449,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:46
-#, java-format
-msgid "<html>Could not read bookmarks.<br>{0}</html>"
+#, fuzzy, java-format
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr "<html>Nelze načíst záložky.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:66
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
@@ -3189,17 +3459,105 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
 msgid "Do not show again"
 msgstr "Znovu nezobrazovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:41
-#, java-format
-msgid ""
-"Failed to initialize communication with the OSM server {0}.\n"
-"Check the server URL in your preferences and your internet connection."
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../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/DefaultNameFormatter.java:90
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+msgid "incomplete"
+msgstr "nekompletní"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+msgid "highway"
+msgstr "silnice"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
+#: build/trans_presets.java:3141
+msgid "railway"
+msgstr "železnice"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+msgid "waterway"
+msgstr "vodní tok"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+msgid "landuse"
+msgstr "využití oblasti (landuse)"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} uzel"
+msgstr[1] "{0} uzly"
+msgstr[2] "{0} uzlů"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#, java-format
+msgid "{0} member"
+msgid_plural "{0} members"
+msgstr[0] "{0} prvek"
+msgstr[1] "{0} prvky"
+msgstr[2] "{0} prvků"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:42
+#, fuzzy, java-format
+msgid ""
+"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
+"the server 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:60
+#. item "Ways/Cycleway" combo "Pedestrians"
+#. item "Ways/Footway" combo "Bikes"
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:58
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:123
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:228
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: 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:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:449
+#: build/trans_presets.java:469 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_presets.java:773
+#: build/trans_presets.java:788 build/trans_presets.java:1330
+#: build/trans_presets.java:1397 build/trans_presets.java:1398
+#: build/trans_presets.java:1399 build/trans_presets.java:2439
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+msgid "unknown"
+msgstr "neznámý"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#, java-format
+msgid ""
+"<html>Failed to close changeset ''{0}'' on the OSM server ''{1}''.<br>The "
+"changeset will automatically be closed by the server after a timeout.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
 #, java-format
 msgid ""
@@ -3212,36 +3570,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:67
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:88
 msgid "Precondition violation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:102
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:183
-#: ../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
-#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: 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:331
-#: build/trans_presets.java:332 build/trans_presets.java:526
-#: build/trans_presets.java:527 build/trans_presets.java:528
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:570
-#: build/trans_presets.java:589 build/trans_presets.java:590
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:611 build/trans_presets.java:612
-#: build/trans_presets.java:631 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_presets.java:768
-#: build/trans_presets.java:783 build/trans_presets.java:1325
-#: build/trans_presets.java:1387
-msgid "unknown"
-msgstr "neznámý"
-
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:109
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
 #, java-format
 msgid ""
@@ -3251,9 +3582,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:118
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139
 msgid "Security exception"
 msgstr "Bezpečnostní vyjímka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:133
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:154
 #, java-format
 msgid ""
@@ -3264,9 +3595,9 @@
 "prověřte funkčnost internetového připojení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:142
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:163
 msgid "Network exception"
 msgstr "Síťová vyjímka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:158
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:179
 #, java-format
 msgid ""
@@ -3277,9 +3608,20 @@
 "problémům s přenosem dat.<br>Detaily(nepřeloženo): {1}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:168
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:189
 msgid "IO Exception"
 msgstr "IO výjimka"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:203
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:213
+msgid "Internal Server Error"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:235
 #, java-format
 msgid ""
@@ -3292,9 +3634,9 @@
 "vaše internetové připojení.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:200
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:245
 msgid "Unknown host"
 msgstr "Neznámé jméno počítače"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:275
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:329
 #, java-format
 msgid ""
@@ -3306,12 +3648,7 @@
 "již na serveru vymazán.<br><br>Chybová zpráva je:<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:286
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:340
 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
@@ -3328,38 +3665,38 @@
 msgstr "Stahuji zprávu dne"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload Preferences"
 msgstr "Nahrát nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
 msgid "Upload the current preferences to the server"
 msgstr "Nahrát současné nastavení na server"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "string"
 msgstr "řetězec"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 msgid "Name of the user."
 msgstr "Jméno uživatele."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "OSM Password."
 msgstr "Heslo OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Změnit velkost appletu (formát: ŠÍŘKAxVÝŠKA)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid "string;string;..."
 msgstr "řetězec;řetězec;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -3369,5 +3706,5 @@
 "nebo název souboru."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -3377,5 +3714,5 @@
 "at=y&lon=x&zoom=z nebo název souboru."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -3385,75 +3722,94 @@
 "jako na Googlu nebo URL vracející osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "any"
 msgstr "cokoliv"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Pokud je nastaveno, smaže se konfigurace, místo jejího načtení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:85
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
 msgid "Username"
 msgstr "Jméno uživatele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:170
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
 msgid "Password"
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
 msgid "Download the bounding box as raw gps"
 msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
 msgid "Launch in maximized mode"
 msgstr "Spustit přes celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
 msgid "Set the language."
 msgstr "Nastavit jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+msgid "options provided as Java system properties"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+msgid "/PATH/TO/JOSM/FOLDER/         "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+msgid "Change the folder for all user settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+msgid ""
+"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
+"the following\n"
+"      Java option to increase the maximum size of allocated memory"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -3463,47 +3819,47 @@
 "selection nejprve nahrajte nějaká data."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 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:124
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:134
 msgid "Activating updated plugins"
 msgstr "Aktivuji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:137
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:147
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:172
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:185
 #, 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:156
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158
 msgid "File"
 msgstr "Soubor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160
 msgid "View"
 msgstr "Zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
 msgid "Tools"
 msgstr "Nástroje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:160
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Presets"
 msgstr "Předvolby"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:185
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:187
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
@@ -3515,21 +3871,21 @@
 
 #. TODO move code to an "action" like the others?
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:231
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:234
 msgid "Wireframe View"
 msgstr "Drátový model"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:233
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:236
 msgid "Toggle Wireframe view"
 msgstr "Přepnout drátový model"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:259
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:262
 msgid "Full Screen"
 msgstr "Celá obrazovka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:261
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:264
 msgid "Toggle Full Screen view"
 msgstr "Přepnout zobrazení na celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
 msgid "Audio"
 msgstr "Zvuk"
@@ -3569,59 +3925,45 @@
 msgstr "Oddálit"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:42
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
 msgid "scale"
 msgstr "měřítko"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:95
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
 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:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
 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:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
 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:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
 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:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 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:167
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
 msgid "(no object)"
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:294
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:311
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
 msgid "layer not in list."
 msgstr "vrstva není v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:498
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
 msgstr "Vrstva ''{0}'' musí být v  seznamu vrstev"
-
-#: ../core/src/org/openstreetmap/josm/gui/OptionPaneUtil.java:56
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:265
-#, 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
@@ -3632,10 +3974,4 @@
 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
@@ -3694,7 +4030,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:104
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
 msgid "Tags"
@@ -3710,5 +4045,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3811,5 +4146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:263
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:82
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
 msgid "My version"
 msgstr "Má verze"
@@ -3820,5 +4155,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:269
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:88
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
 msgid "Merged version"
@@ -3832,5 +4167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:94
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
 msgid "Their version"
 msgstr "Cizí verze"
@@ -3912,6 +4247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:101
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
 msgid "Remove"
@@ -4028,10 +4363,10 @@
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:181
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java:182
 #, java-format
 msgid "unexpected column index. Got {0}"
 msgstr "neočekávaný index sloupce. Zadáno {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:422
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421
 #, java-format
 msgid ""
@@ -4040,19 +4375,19 @@
 msgstr "<html>Při komunikaci se serverem doslo k chybě<br>Detaily: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:426
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:425
 msgid "Communication with server failed"
 msgstr "Komunikace se serverem selhala"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:496
 msgid "Yes, undelete them too"
 msgstr "Ano, obnovit je také"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:469
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:497
 msgid "No, cancel operation"
 msgstr "Ne, zruš operaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:473
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:472
 #, java-format
 msgid ""
@@ -4063,5 +4398,5 @@
 "serveru.<br><br>Chcete obnovit také tyto body?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:478
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477
 msgid "Undelete additional nodes?"
 msgstr "Obnovit další body?"
@@ -4081,9 +4416,9 @@
 msgstr "Obnovit závislé prvky?"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:83
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79
 msgid "Properties in my dataset, i.e. the local dataset"
 msgstr "Vlastnosti v mé datové sadě, např lokální datové sadě"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:89
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
 msgid ""
 "Properties in the merged element. They will replace properties in my "
@@ -4093,95 +4428,97 @@
 "sloučení aplikováno."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:95
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
 msgid "Properties in their dataset, i.e. the server dataset"
 msgstr "Vlastnosti v cizí datové sadě, např serverová datová sada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107
 msgid "Coordinates:"
 msgstr "Souřadnice:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:187
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:183
 msgid "Deleted State:"
 msgstr "Stav smazáno:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:260
 msgid "Visible State:"
 msgstr "Stav viditelné:"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:344
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:352
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:361
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:370
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
 msgid "(none)"
 msgstr "(žádný)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:354
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:50
 msgid "deleted"
 msgstr "smazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:356
 msgid "not deleted"
 msgstr "nesmazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:367
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:363
 msgid "visible (on the server)"
 msgstr "viditelný (na serveru)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:365
 msgid "not visible (on the server)"
 msgstr "neviditelný (na serveru)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:372
 msgid "Keep a clone of the local version"
 msgstr "Ponechat klon lokální verze"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:378
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:374
 msgid "Physically delete from local dataset"
 msgstr "Fyzicky odstranit z lokální datové sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:477
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:473
 msgid "Keep my coordiates"
 msgstr "Ponechat mé souřadnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:492
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:488
 msgid "Keep their coordiates"
 msgstr "Ponechat cizí souřadnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:507
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:503
 msgid "Undecide conflict between different coordinates"
 msgstr "Nerozhodnutý konflikt rozdílných souřadnic"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:522
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:518
 msgid "Keep my deleted state"
 msgstr "Ponechat můj stav vymazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:537
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:533
 msgid "Keep their deleted state"
 msgstr "Ponechat cizí stav vymazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:552
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:548
 msgid "Undecide conflict between deleted state"
 msgstr "Nerozhodnutý konflikt stavu vymazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:567
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:563
 msgid "Keep my visible state"
 msgstr "Ponechat můj stav viditelné"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:582
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:578
 msgid "Yes, reset the id"
 msgstr "Ano, resetovat id"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:579
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:620
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:189
 msgid "No, abort"
 msgstr "Ne, zrušit"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:587
-#, java-format
-msgid ""
-"<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} to "
-"0.<br>On the next upload the server will assign<br>it a new id.<br>Do yo "
-"agree?</html>"
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:583
+#, fuzzy, java-format
+msgid ""
+"<html>To keep your local version, JOSM<br>has to reset the id of primitive "
+"{0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
+"yo agree?</html>"
 msgstr ""
 "<html>Pro ponechání vaší lokální verze, JOSM<br>resetuje id {0} {1} na 0."
@@ -4189,17 +4526,17 @@
 "<br>Souhlasíte s tím?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:595
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590
 msgid "Reset id to 0"
 msgstr "Resetovat id na 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:608
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
 msgid "Keep their visible state"
 msgstr "Ponechat cizí stav viditelné"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:623
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
 msgid "Yes, purge it"
 msgstr "Ano, vyčistit to"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:624
 #, java-format
 msgid ""
@@ -4210,21 +4547,21 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:629
 msgid "Remove from dataset"
 msgstr "Odstranit z datové sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:643
 msgid "Undecide conflict between visible state"
 msgstr "Nerozhodnutý konflikt stavu viditelné"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:19
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
 msgid "Role"
 msgstr "Role"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:25
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26
 msgid "Primitive"
 msgstr "Prvek"
@@ -4263,10 +4600,11 @@
 #. setting up the properties table
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:167
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:61
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:65
 #: ../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
@@ -4275,10 +4613,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:198
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../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:76
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:266
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:196
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:459
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:72
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -4292,5 +4631,5 @@
 
 #. should not happen, but just in case
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java:39
 #, java-format
 msgid "Parameter 'col' must be 0 or 1. Got {0}"
@@ -4331,4 +4670,144 @@
 msgid "Their dataset does not include a tag with key {0}"
 msgstr "Cizí datová sada neobsahuje tag s klíčem {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "none"
+msgstr "nic"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
+#: build/trans_presets.java:2272
+msgid "all"
+msgstr "všechny"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:41
+#, fuzzy
+msgid "Choose a value"
+msgstr "Zvolit barvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:43
+msgid "Please decided which values to keep"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:47
+#, java-format
+msgid "Value ''{0}'' is going to be applied for key ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
+#, java-format
+msgid "The key ''{0}'' and all it's values are going to be removed"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:56
+#, java-format
+msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
+#, fuzzy, java-format
+msgid "parameter ''{0}'' must not be empty"
+msgstr "parameter ''{0}'' nesmí být null"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
+#, fuzzy, java-format
+msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
+msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
+msgid "tag collection doesn't include the selected value ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:156
+#, fuzzy
+msgid "not yet decided"
+msgstr "nesmazáno"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:232
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:270
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:289
+#, fuzzy
+msgid "Not decided yet"
+msgstr "Zatím neimplementováno."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+#, fuzzy
+msgid "Tags from ways"
+msgstr "z cesty"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+#, fuzzy
+msgid "Tags from relations"
+msgstr "Odstranit z relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+#, fuzzy
+msgid "Conflicts in pasted tags"
+msgstr "Konflikty v datech"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} cesta"
+msgstr[1] "{0} cesty"
+msgstr[2] "{0} cest"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} relace"
+msgstr[1] "{0} relace"
+msgstr[2] "{0} relací"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+#, fuzzy
+msgid "Cancel conflict resolution"
+msgstr "Řešení konfliktů"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#, fuzzy
+msgid "Apply resolved conflicts"
+msgstr "Vyřešit konflikty"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+msgid "Apply"
+msgstr "Aplikovat"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#, fuzzy
+msgid "Paste ..."
+msgstr "Vložit"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgid "From ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgid "To ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#, fuzzy, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] "{0} začátek"
+msgstr[1] "{0} začátek"
+msgstr[2] "{0} začátek"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4344,10 +4823,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../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:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -4355,5 +4834,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:75
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
 #, java-format
 msgid "Toggle: {0}"
@@ -4386,36 +4865,30 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:98
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
 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:141
-msgid ""
-"Warning: couldn't setAlwaysOnTop(true) for ConflictResolution Dialog. "
-"Exception: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:162
 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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:180
 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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:181
 msgid "Apply Resolution"
 msgstr "Aplikovat řešení"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 msgid "Close anyway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
 msgid "Continue resolving"
 msgstr "Pokračovat v řešení"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:196
 #, java-format
 msgid ""
@@ -4427,150 +4900,118 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:210
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
 msgid "Conflict not resolved completely"
 msgstr "Konflikt není vyřešen kompletně"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:246
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
 msgid "Resolve conflicts"
 msgstr "Vyřešit konflikty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:243
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
 msgstr "Vyřešit konflikty pro ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
 msgid "History"
 msgstr "Historie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
 msgid "Display the history of all selected items."
 msgstr "Zobrazit historii všech zobrazených objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:252
-#, java-format
-msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
-msgstr "<html>Selhalo nahrávání historie ze serveru. Detaily:<br>{0}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
 #, java-format
 msgid "index out of bounds Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:366
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, fuzzy, java-format
+msgid "Way {0}"
+msgstr "Vrstva: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, fuzzy, java-format
+msgid "Relation {0}"
+msgstr "Relace: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
 msgid "History item"
 msgstr "Položka historie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:387
-msgid "Load history"
-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 "Nahrávám historii pro {0} s id {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:451
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
 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:474
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
 msgid "Show"
 msgstr "Zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
 msgid "Display the history of the selected primitive"
 msgstr "Zobrazit historii vybraného prvku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
 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:296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
 msgid "Delete the selected layer."
 msgstr "Smazat označenou vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:304
-#, java-format
-msgid "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
-msgstr "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:305
-msgid "Delete Layer"
-msgstr "Smazat vrstvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:315
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:332
-#, java-format
-msgid "Do you really want to delete layer ''{0}''?"
-msgstr "Opravdu chcete smazat vrstvu ''{0}''?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:316
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:132
-msgid "Confirmation"
-msgstr "Potvrzení"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:324
-msgid "Yes"
-msgstr "Ano"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:325
-msgid "No"
-msgstr "Ne"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:326
-msgid "Delete all"
-msgstr "Smazat vše"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:333
-#, java-format
-msgid "Deleting layer {0} of {1}"
-msgstr "Mazání vrstvy {0} z {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:437
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
 msgid "Show/Hide"
 msgstr "Zobrazit/Skrýt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
 msgid "Toggle visible state of the selected layer."
 msgstr "Přepnout viditelnost zvolené vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
 msgid "Activate"
 msgstr "Aktivovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:490
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
 msgid "Activate the selected layer"
 msgstr "Aktivovat vybranou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:545
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
 msgid "Merge this layer into another layer"
 msgstr "Sloučit tuto vrstvu do jiné vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:651
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
 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:670
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
 msgid "Move the selected layer one row down."
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:34
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
 msgid "Information about layer"
 msgstr "Informace o vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:332
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
 #, java-format
 msgid "This will change up to {0} object."
@@ -4580,28 +5021,22 @@
 msgstr[2] "Toto změní až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
 msgid "An empty value deletes the key."
 msgstr "Prázdná hodnota smaže klíč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:195
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:489
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:532
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:97
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:112
 msgid "<different>"
 msgstr "<různé>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:209
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../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:213
-#, 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:273
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -4611,89 +5046,84 @@
 msgstr[2] "Změnit vlastnosti až  {0} objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:334
+#: ../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:344
+#: ../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:360
-#, java-format
-msgid "Warning: failed to put dialog always on top. Exception was: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
 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:468
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:468
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pro zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
 msgid "Add Properties"
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:589
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagTable.java:256
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:260
 #: ../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:619
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:65
 msgid "Add"
 msgstr "Přidat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 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:593
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:577
 msgid "Edit Properties"
 msgstr "Upravit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:580
 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:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:850
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:834
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:851
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
 #, 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:878
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:855
 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:880
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
@@ -4702,34 +5132,34 @@
 #. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:74
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:148
-#: build/trans_presets.java:2978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
+#: build/trans_presets.java:3106
 msgid "Relations"
 msgstr "Relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 msgid "Open a list of all relations."
 msgstr "Otevřít seznam všech relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relace: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
 msgid "Open an editor for the selected relation"
 msgstr "Otevřít editor pro zvolenou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
 msgid "Delete the selected relation"
 msgstr "Smazat vybrané relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
 msgid "Create a new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:375
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1443
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvořit kopii relace a otevřít ji v novém okně"
@@ -4762,25 +5192,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
 #: ../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:336
-#, java-format
-msgid "{0} way"
-msgid_plural "{0} ways"
-msgstr[0] "{0} cesta"
-msgstr[1] "{0} cesty"
-msgstr[2] "{0} cest"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
-#, java-format
-msgid "{0} relation"
-msgid_plural "{0} relations"
-msgstr[0] "{0} relace"
-msgstr[1] "{0} relace"
-msgstr[2] "{0} relací"
-
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
@@ -4788,14 +5202,9 @@
 msgstr "Výběr: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:160
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
 msgid "Undock the panel"
 msgstr "Vytrhnout panel"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4804,64 +5213,101 @@
 "nástrojů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:227
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
 msgid "Click to minimize/maximize the panel content"
 msgstr "Minimalizovat nebo maximalizovat obsah panelu"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:135
 msgid "Authors"
 msgstr "Autoři"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 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:59
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133
+#, fuzzy, java-format
+msgid "{0} Author"
+msgid_plural "{0} Authors"
+msgstr[0] "Autor"
+msgstr[1] "Autor"
+msgstr[2] "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
+#, fuzzy
+msgid "Select primitives submitted by this user"
+msgstr "Vybrat prvky pro vybrané členy relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
+#, fuzzy
+msgid "Show info"
+msgstr "Zobrazit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
+#, fuzzy
+msgid "Launches a browser with information about the user"
+msgstr "Více informací o tomto přednastavení"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
+#, fuzzy, java-format
+msgid ""
+"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgstr ""
+"UPOZORNĚNÍ: Otevírám okno prohlížeče pouze pro první {0} z {1} vybraných "
+"primitiv."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208
+#, java-format
+msgid ""
+"<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
+"missing on this system.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
+msgid "Missing encoding"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
 msgid "Author"
 msgstr "Autor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:59
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
 msgid "# Objects"
 msgstr "# Objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:123
-#, java-format
-msgid "Authors: {0}"
-msgstr "Autoři: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Upravit relaci na kterou odkazuje vybraný člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
 msgid "Download all child relations (recursively)"
 msgstr "Stáhnout všechny potomky relace (rekurzivně)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
 msgid "Download All Children"
 msgstr "Stáhnout všechny potomky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
 msgid "Download selected relations"
 msgstr "Stáhnout vybrané relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
 msgid "Download Selected Children"
 msgstr "Stáhnout vybrané potomky"
 
-#: ../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:1533
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
 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
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
 msgid "Conflicts in data"
 msgstr "Konflikty v datech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:343
 #, java-format
 msgid ""
@@ -4871,47 +5317,41 @@
 "<html>Potomek relace<br>{0}<br>byl smazán na serveru. Nemůže být stažen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:355
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:352
 msgid "Relation is deleted"
 msgstr "Relace je smazána"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:413
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:524
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:519
 #, java-format
 msgid "Downloading relation {0}"
 msgstr "Stahování relace {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:1597
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:198
 #, java-format
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
 msgid "Tags and Members"
 msgstr "Značky a Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:172
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
 msgid "Parent Relations"
 msgstr "Rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
 msgid "Child Relations"
 msgstr "Potomci 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:611
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
 msgid "Role:"
 msgstr "Role:"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -4923,14 +5363,14 @@
 "provést s touto cyklickou závislostí?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:688
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
 msgid "Remove them, clean up relation"
 msgstr "Odstranit, vyčistit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorovat, ponechat relaci jak je"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:712
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
 #, java-format
 msgid ""
@@ -4942,9 +5382,9 @@
 "''{0}''<br><br>Opravdu chcete přidat dalšího člena relace?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:722
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
 msgid "Multiple members referring to same primitive"
 msgstr "Více členů odkazuje na stejný prvek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:740
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 #, java-format
 msgid ""
@@ -4957,10 +5397,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:781
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:807
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -4968,5 +5408,5 @@
 "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -4976,5 +5416,5 @@
 "člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -4984,20 +5424,20 @@
 "člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:901
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor relací: Odstranit vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:938
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
 #, java-format
 msgid ""
@@ -5006,57 +5446,57 @@
 msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
 msgid "Select primitives for selected relation members"
 msgstr "Vybrat prvky pro vybrané členy relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:993
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
 msgid "Sort the relation members"
 msgstr "Seřadit členy relace"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:996
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1008
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
 msgid "Move the currently selected members up"
 msgstr "Přesunout zvolené členy nahoru"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1011
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
 msgid "Move the currently selected members down"
 msgstr "Přesunout zvolené členy dolů"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
 msgid "Remove the currently selected members from this relation"
 msgstr "Odstranit vybrané členy z relace"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
 msgid "Relation Editor: Remove"
 msgstr "Editor relací: Odstranit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5065,9 +5505,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 msgid "Conflict in data"
 msgstr "Konflikt v datech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
 #, java-format
 msgid ""
@@ -5076,20 +5516,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Apply the current updates"
 msgstr "Aplikovat aktuální změny"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply"
-msgstr "Aplikovat"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
 msgid "Apply the updates and close the dialog"
 msgstr "Aplikovat změny a zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1223
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:160
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../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
@@ -5099,37 +5535,37 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1255
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr "Zrušit změny a zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1272
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
 msgid "Add an empty tag"
 msgstr "Přidat prázdnou značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
 msgid "Delete the currently selected tags"
 msgstr "Smazat vybrané značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
 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:1352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
 msgid "Download Members"
 msgstr "Stáhnout prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
 msgid "Relation Editor: Download Members"
 msgstr "Editor relací: Stáhnout členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
 msgid "Sets a role for the selected members"
 msgstr "Nastaví roli pro vybrané členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
 msgid "Apply Role"
 msgstr "Aplikovat roli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1387
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
 #, java-format
 msgid ""
@@ -5141,30 +5577,30 @@
 "role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
 msgid "Yes, apply it"
 msgstr "Ano, aplikovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
 msgid "No, don't apply"
 msgstr "Ne, neaplikovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1398
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
 msgid "Confirm empty role"
 msgstr "Potvrdit prázdnou roli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
 msgstr "Zvětšit na"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:199
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:229
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
 msgid "Zoom to primitive the first selected member refers to"
 msgstr "Zvětšit na prvek odkazovaný prvním členem výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:220
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Zvětšování je neaktivní protože je neaktivní vrstva s touto relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:219
 msgid "Zooming disabled because there is no selected member"
 msgstr "Zvětšování je neaktivní protože nebyl vybrán žádný člen"
@@ -5178,22 +5614,27 @@
 msgstr "Spojený"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:75
 msgid "Download referring relations"
 msgstr "Stáhnout odkazované relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:81
 #, java-format
 msgid "child.id >0 expected. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
 msgid "including immediate children of parent relations"
 msgstr "včetně přímých potomků rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
 msgid "Load parent relations"
 msgstr "Načíst rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
+#, fuzzy
+msgid "Loading parent relations"
+msgstr "Načíst rodičovské relace"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
 msgid "Edit the currently selected relation"
 msgstr "Upravit vybranou relaci"
@@ -5226,35 +5667,21 @@
 msgstr "Varovaní: ignoruji výjimku protože úloha byla přerušena. Výjimka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/TagCellRenderer.java:70
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
-msgid "<multiple>"
-msgstr "<mnohonásobný>"
-
-#: ../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
-msgid "Remove old keys from up to {0} object"
-msgid_plural "Remove old keys from up to {0} objects"
-msgstr[0] "Odstranit staré klíče z {0} objektů"
-msgstr[1] "Odstranit staré klíče z {0} objektu"
-msgstr[2] "Odstranit staré klíče z {0} objektů"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:45
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
 msgid "Please enter the desired coordinates first."
 msgstr "Prosím zadejte nejdříve pozadovanou pozici"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
 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:91
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
 msgid "Name of location"
 msgstr "Jméno lokace"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
 msgid "Select a bookmark first."
 msgstr "Nejdříve zvolte záložku"
@@ -5308,13 +5735,13 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:118
 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:171
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:168
 msgid "Please enter a search string"
 msgstr "Prosím, zadejte hledaný řetězec"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:195
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:192
 msgid "Cannot read place search results from server"
 msgstr "Nemohu načíst výsledky hledání ze serveru"
@@ -5322,18 +5749,17 @@
 #. 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:217
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:214
 msgid "Enter a place name to search for:"
 msgstr "Zadej jméno místa které chceš najít:"
 
-#. item "Health/Veterinary" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:229
-#: build/trans_presets.java:2623
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
+#: build/trans_presets.java:2744
 msgid "Places"
 msgstr "Místa"
 
 #. TODO - this is probably not the coolest way to set relative sizes?
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:243
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
 msgid "name"
 msgstr "jméno"
@@ -5372,37 +5798,37 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:253
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1934
-#: build/trans_presets.java:1940 build/trans_presets.java:1949
-#: build/trans_presets.java:1956 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
-#: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2054 build/trans_presets.java:2060
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
+#: build/trans_presets.java:1923 build/trans_presets.java:1929
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2016
+#: build/trans_presets.java:2023 build/trans_presets.java:2031
+#: build/trans_presets.java:2037 build/trans_presets.java:2043
+#: build/trans_presets.java:2049 build/trans_presets.java:2055
+#: build/trans_presets.java:2061 build/trans_presets.java:2067
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
 msgid "type"
 msgstr "typ"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:248
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:254
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:251
 msgid "near"
 msgstr "poblíž"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:249
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:246
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:252
 msgid "zoom"
 msgstr "Zvětšení"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:121
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5414,5 +5840,5 @@
 "b> Klik."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:124
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
 msgid "Slippy map"
 msgstr "Aktuální mapa"
@@ -5439,47 +5865,75 @@
 msgstr "Čísla dlaždic"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:37
-#, java-format
-msgid "History for {0} {1}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:44
+#, fuzzy, java-format
+msgid "History for node {0}"
 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
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
+#, fuzzy, java-format
+msgid "History for way {0}"
+msgstr "Historie pro {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
+#, fuzzy, java-format
+msgid "History for relation {0}"
+msgstr "Historie pro {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
 msgid "Close the dialog"
 msgstr "Zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:179
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
+#, fuzzy
+msgid "Reload the history from the server"
+msgstr "Zobrazit historii vybraného prvku"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
 msgid "history not initialized yet. Failed to set reference primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:181
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:200
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:201
 #, java-format
 msgid "failed to set reference. reference id {0} doesn't match history id {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:184
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:185
 #, java-format
 msgid "failed to set reference. reference version {0} not available in history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:198
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:199
 msgid "history not initialized yet. Failed to set current primitive."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:203
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:204
 #, java-format
 msgid "failed to set current. current version {0} not available in history"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#, java-format
-msgid "Node {0}"
-msgstr "Bod {0}"
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:34
+msgid "Load history"
+msgstr "Nahrát hostorii"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:40
+#, fuzzy, java-format
+msgid "id > 0 expected, got {0}"
+msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
+#, fuzzy, java-format
+msgid "Loading history for node {0}"
+msgstr "Nahrávám historii pro {0} s id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116
+#, fuzzy, java-format
+msgid "Loading history for way {0}"
+msgstr "Nahrávám historii pro {0} s id {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
+#, fuzzy, java-format
+msgid "Loading history for relation {0}"
+msgstr "Nahrávám historii pro {0} s id {1}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -5797,14 +6251,28 @@
 #. item "Tourism/Artwork" label "Edit Artwork"
 #. <key key="tourism" value="artwork" />
-#. item "Tourism/Information Office" label "Edit Information Office"
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="office" />
 #. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
 #. <key key="tourism" value="information" />
+#. <key key="information" value="map" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="board" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
 #. <key key="tourism" value="information" />
 #. <key key="information" value="guidepost" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="terminal" />
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="audioguide" />
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
@@ -5980,8 +6448,14 @@
 #. item "Shops/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
+#. item "Shops/Chemist" label "Edit Chemist"
+#. <key key="shop" value="chemist" />
 #. item "Shops/Convenience Store" label "Edit Convenience Store"
 #. <key key="shop" value="convenience" />
 #. item "Shops/Kiosk" label "Edit Kiosk"
 #. <key key="shop" value="kiosk" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
 #. item "Shops/Butcher" label "Edit Butcher"
 #. <key key="shop" value="butcher" />
@@ -6078,4 +6552,7 @@
 #. <space />
 #. <key key="place" value="island" />
+#. item "Places/Islet" label "Edit Islet"
+#. <space />
+#. <key key="place" value="islet" />
 #. item "Places/Cave Entrance" label "Edit Cave Entrance"
 #. <key key="natural" value="cave_entrance" />
@@ -6189,6 +6666,6 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:20
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:66 build/trans_presets.java:102
 #: build/trans_presets.java:142 build/trans_presets.java:179
@@ -6196,156 +6673,174 @@
 #: build/trans_presets.java:234 build/trans_presets.java:252
 #: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:350 build/trans_presets.java:370
-#: build/trans_presets.java:385 build/trans_presets.java:402
-#: build/trans_presets.java:422 build/trans_presets.java:442
-#: build/trans_presets.java:461 build/trans_presets.java:479
-#: build/trans_presets.java:499 build/trans_presets.java:519
-#: build/trans_presets.java:540 build/trans_presets.java:561
-#: build/trans_presets.java:582 build/trans_presets.java:603
-#: build/trans_presets.java:624 build/trans_presets.java:653
-#: build/trans_presets.java:674 build/trans_presets.java:687
-#: build/trans_presets.java:700 build/trans_presets.java:713
-#: build/trans_presets.java:726 build/trans_presets.java:739
-#: build/trans_presets.java:750 build/trans_presets.java:759
-#: build/trans_presets.java:806 build/trans_presets.java:827
-#: build/trans_presets.java:836 build/trans_presets.java:896
-#: build/trans_presets.java:1046 build/trans_presets.java:1054
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1080 build/trans_presets.java:1088
-#: build/trans_presets.java:1093 build/trans_presets.java:1100
-#: build/trans_presets.java:1107 build/trans_presets.java:1112
-#: build/trans_presets.java:1120 build/trans_presets.java:1129
-#: build/trans_presets.java:1135 build/trans_presets.java:1141
-#: build/trans_presets.java:1146 build/trans_presets.java:1152
-#: build/trans_presets.java:1158 build/trans_presets.java:1167
-#: build/trans_presets.java:1176 build/trans_presets.java:1183
-#: build/trans_presets.java:1191 build/trans_presets.java:1204
-#: build/trans_presets.java:1210 build/trans_presets.java:1219
-#: build/trans_presets.java:1225 build/trans_presets.java:1231
-#: build/trans_presets.java:1239 build/trans_presets.java:1294
-#: build/trans_presets.java:1341 build/trans_presets.java:1347
-#: build/trans_presets.java:1353 build/trans_presets.java:1359
-#: build/trans_presets.java:1365 build/trans_presets.java:1376
-#: build/trans_presets.java:1384 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1406
-#: build/trans_presets.java:1414 build/trans_presets.java:1421
-#: build/trans_presets.java:1430 build/trans_presets.java:1438
-#: build/trans_presets.java:1445 build/trans_presets.java:1456
-#: build/trans_presets.java:1466 build/trans_presets.java:1476
-#: build/trans_presets.java:1496 build/trans_presets.java:1508
-#: build/trans_presets.java:1519 build/trans_presets.java:1536
-#: build/trans_presets.java:1543 build/trans_presets.java:1558
-#: build/trans_presets.java:1565 build/trans_presets.java:1570
-#: build/trans_presets.java:1576 build/trans_presets.java:1582
-#: build/trans_presets.java:1587 build/trans_presets.java:1593
-#: build/trans_presets.java:1599 build/trans_presets.java:1607
-#: build/trans_presets.java:1614 build/trans_presets.java:1621
-#: build/trans_presets.java:1627 build/trans_presets.java:1632
-#: build/trans_presets.java:1638 build/trans_presets.java:1644
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1677 build/trans_presets.java:1683
-#: build/trans_presets.java:1691 build/trans_presets.java:1697
-#: build/trans_presets.java:1704 build/trans_presets.java:1712
-#: build/trans_presets.java:1718 build/trans_presets.java:1725
-#: build/trans_presets.java:1731 build/trans_presets.java:1741
-#: build/trans_presets.java:1746 build/trans_presets.java:1753
-#: build/trans_presets.java:1759 build/trans_presets.java:1765
-#: build/trans_presets.java:1771 build/trans_presets.java:1776
+#: build/trans_presets.java:351 build/trans_presets.java:371
+#: build/trans_presets.java:386 build/trans_presets.java:403
+#: build/trans_presets.java:423 build/trans_presets.java:443
+#: build/trans_presets.java:463 build/trans_presets.java:482
+#: build/trans_presets.java:502 build/trans_presets.java:522
+#: build/trans_presets.java:543 build/trans_presets.java:564
+#: build/trans_presets.java:585 build/trans_presets.java:606
+#: build/trans_presets.java:627 build/trans_presets.java:658
+#: build/trans_presets.java:679 build/trans_presets.java:692
+#: build/trans_presets.java:705 build/trans_presets.java:718
+#: build/trans_presets.java:731 build/trans_presets.java:744
+#: build/trans_presets.java:755 build/trans_presets.java:764
+#: build/trans_presets.java:811 build/trans_presets.java:832
+#: build/trans_presets.java:841 build/trans_presets.java:901
+#: build/trans_presets.java:1051 build/trans_presets.java:1059
+#: build/trans_presets.java:1067 build/trans_presets.java:1075
+#: build/trans_presets.java:1085 build/trans_presets.java:1093
+#: build/trans_presets.java:1098 build/trans_presets.java:1105
+#: build/trans_presets.java:1112 build/trans_presets.java:1117
+#: build/trans_presets.java:1125 build/trans_presets.java:1134
+#: build/trans_presets.java:1140 build/trans_presets.java:1146
+#: build/trans_presets.java:1151 build/trans_presets.java:1157
+#: build/trans_presets.java:1163 build/trans_presets.java:1172
+#: build/trans_presets.java:1181 build/trans_presets.java:1188
+#: build/trans_presets.java:1196 build/trans_presets.java:1209
+#: build/trans_presets.java:1215 build/trans_presets.java:1224
+#: build/trans_presets.java:1230 build/trans_presets.java:1236
+#: build/trans_presets.java:1244 build/trans_presets.java:1299
+#: build/trans_presets.java:1346 build/trans_presets.java:1352
+#: build/trans_presets.java:1358 build/trans_presets.java:1364
+#: build/trans_presets.java:1370 build/trans_presets.java:1381
+#: build/trans_presets.java:1390 build/trans_presets.java:1405
+#: build/trans_presets.java:1412 build/trans_presets.java:1418
+#: build/trans_presets.java:1426 build/trans_presets.java:1433
+#: build/trans_presets.java:1442 build/trans_presets.java:1450
+#: build/trans_presets.java:1457 build/trans_presets.java:1468
+#: build/trans_presets.java:1478 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1520
+#: build/trans_presets.java:1531 build/trans_presets.java:1548
+#: build/trans_presets.java:1555 build/trans_presets.java:1570
+#: build/trans_presets.java:1577 build/trans_presets.java:1582
+#: build/trans_presets.java:1588 build/trans_presets.java:1594
+#: build/trans_presets.java:1599 build/trans_presets.java:1605
+#: build/trans_presets.java:1611 build/trans_presets.java:1619
+#: build/trans_presets.java:1627 build/trans_presets.java:1635
+#: build/trans_presets.java:1642 build/trans_presets.java:1648
+#: build/trans_presets.java:1655 build/trans_presets.java:1662
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1698 build/trans_presets.java:1705
+#: build/trans_presets.java:1712 build/trans_presets.java:1719
+#: build/trans_presets.java:1736 build/trans_presets.java:1744
+#: build/trans_presets.java:1759 build/trans_presets.java:1769
 #: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1799
-#: build/trans_presets.java:1807 build/trans_presets.java:1816
-#: build/trans_presets.java:1825 build/trans_presets.java:1834
-#: build/trans_presets.java:1843 build/trans_presets.java:1848
-#: build/trans_presets.java:1855 build/trans_presets.java:1861
-#: build/trans_presets.java:1867 build/trans_presets.java:1873
-#: build/trans_presets.java:1879 build/trans_presets.java:1885
-#: build/trans_presets.java:1891 build/trans_presets.java:1897
-#: build/trans_presets.java:1903 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:1921
-#: build/trans_presets.java:1927 build/trans_presets.java:1933
-#: build/trans_presets.java:1939 build/trans_presets.java:1946
-#: build/trans_presets.java:1955 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2047
-#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:1794 build/trans_presets.java:1804
+#: build/trans_presets.java:1809 build/trans_presets.java:1817
+#: build/trans_presets.java:1824 build/trans_presets.java:1830
+#: build/trans_presets.java:1836 build/trans_presets.java:1841
+#: build/trans_presets.java:1846 build/trans_presets.java:1853
+#: build/trans_presets.java:1859 build/trans_presets.java:1864
+#: build/trans_presets.java:1872 build/trans_presets.java:1881
+#: build/trans_presets.java:1890 build/trans_presets.java:1899
+#: build/trans_presets.java:1908 build/trans_presets.java:1914
+#: build/trans_presets.java:1922 build/trans_presets.java:1928
+#: build/trans_presets.java:1934 build/trans_presets.java:1940
+#: build/trans_presets.java:1946 build/trans_presets.java:1952
+#: build/trans_presets.java:1958 build/trans_presets.java:1964
+#: build/trans_presets.java:1970 build/trans_presets.java:1976
+#: build/trans_presets.java:1982 build/trans_presets.java:1988
+#: build/trans_presets.java:1994 build/trans_presets.java:2000
+#: build/trans_presets.java:2006 build/trans_presets.java:2013
+#: build/trans_presets.java:2022 build/trans_presets.java:2030
+#: build/trans_presets.java:2036 build/trans_presets.java:2042
+#: build/trans_presets.java:2048 build/trans_presets.java:2054
+#: build/trans_presets.java:2060 build/trans_presets.java:2066
 #: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2091
-#: build/trans_presets.java:2098 build/trans_presets.java:2106
-#: build/trans_presets.java:2113 build/trans_presets.java:2119
-#: build/trans_presets.java:2125 build/trans_presets.java:2131
-#: build/trans_presets.java:2137 build/trans_presets.java:2143
+#: build/trans_presets.java:2084 build/trans_presets.java:2090
+#: build/trans_presets.java:2096 build/trans_presets.java:2102
+#: build/trans_presets.java:2108 build/trans_presets.java:2114
+#: build/trans_presets.java:2120 build/trans_presets.java:2126
+#: build/trans_presets.java:2139 build/trans_presets.java:2145
 #: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2164 build/trans_presets.java:2171
-#: build/trans_presets.java:2179 build/trans_presets.java:2210
-#: build/trans_presets.java:2215 build/trans_presets.java:2220
-#: build/trans_presets.java:2225 build/trans_presets.java:2231
-#: build/trans_presets.java:2237 build/trans_presets.java:2243
-#: build/trans_presets.java:2251 build/trans_presets.java:2257
-#: build/trans_presets.java:2263 build/trans_presets.java:2269
-#: build/trans_presets.java:2275 build/trans_presets.java:2285
-#: build/trans_presets.java:2378 build/trans_presets.java:2385
-#: build/trans_presets.java:2399 build/trans_presets.java:2405
-#: build/trans_presets.java:2411 build/trans_presets.java:2432
-#: build/trans_presets.java:2438 build/trans_presets.java:2444
-#: build/trans_presets.java:2449 build/trans_presets.java:2455
-#: build/trans_presets.java:2460 build/trans_presets.java:2465
-#: build/trans_presets.java:2470 build/trans_presets.java:2475
-#: build/trans_presets.java:2480 build/trans_presets.java:2486
-#: build/trans_presets.java:2492 build/trans_presets.java:2498
-#: build/trans_presets.java:2503 build/trans_presets.java:2508
-#: build/trans_presets.java:2513 build/trans_presets.java:2518
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2546 build/trans_presets.java:2551
-#: build/trans_presets.java:2560 build/trans_presets.java:2567
-#: build/trans_presets.java:2581 build/trans_presets.java:2586
-#: build/trans_presets.java:2593 build/trans_presets.java:2599
-#: build/trans_presets.java:2619 build/trans_presets.java:2628
-#: build/trans_presets.java:2634 build/trans_presets.java:2640
-#: build/trans_presets.java:2646 build/trans_presets.java:2652
-#: build/trans_presets.java:2659 build/trans_presets.java:2666
-#: build/trans_presets.java:2673 build/trans_presets.java:2679
-#: build/trans_presets.java:2685 build/trans_presets.java:2693
-#: build/trans_presets.java:2700 build/trans_presets.java:2707
-#: build/trans_presets.java:2713 build/trans_presets.java:2720
-#: build/trans_presets.java:2727 build/trans_presets.java:2736
-#: build/trans_presets.java:2742 build/trans_presets.java:2748
-#: build/trans_presets.java:2754 build/trans_presets.java:2760
-#: build/trans_presets.java:2769 build/trans_presets.java:2779
-#: build/trans_presets.java:2788 build/trans_presets.java:2794
-#: build/trans_presets.java:2800 build/trans_presets.java:2805
-#: build/trans_presets.java:2811 build/trans_presets.java:2817
-#: build/trans_presets.java:2826 build/trans_presets.java:2832
-#: build/trans_presets.java:2838 build/trans_presets.java:2844
-#: build/trans_presets.java:2850 build/trans_presets.java:2856
-#: build/trans_presets.java:2862 build/trans_presets.java:2869
-#: build/trans_presets.java:2875 build/trans_presets.java:2880
-#: build/trans_presets.java:2887 build/trans_presets.java:2894
-#: build/trans_presets.java:2900 build/trans_presets.java:2909
-#: build/trans_presets.java:2917 build/trans_presets.java:2923
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2949
-#: build/trans_presets.java:2955 build/trans_presets.java:2961
-#: build/trans_presets.java:2967 build/trans_presets.java:2973
-#: build/trans_presets.java:2986 build/trans_presets.java:3000
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:2165 build/trans_presets.java:2173
+#: build/trans_presets.java:2180 build/trans_presets.java:2186
+#: build/trans_presets.java:2192 build/trans_presets.java:2198
+#: build/trans_presets.java:2204 build/trans_presets.java:2210
+#: build/trans_presets.java:2218 build/trans_presets.java:2225
+#: build/trans_presets.java:2232 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2279
+#: build/trans_presets.java:2284 build/trans_presets.java:2289
+#: build/trans_presets.java:2294 build/trans_presets.java:2300
+#: build/trans_presets.java:2306 build/trans_presets.java:2312
+#: build/trans_presets.java:2320 build/trans_presets.java:2326
+#: build/trans_presets.java:2332 build/trans_presets.java:2338
+#: build/trans_presets.java:2344 build/trans_presets.java:2354
+#: build/trans_presets.java:2448 build/trans_presets.java:2455
+#: build/trans_presets.java:2469 build/trans_presets.java:2475
+#: build/trans_presets.java:2482 build/trans_presets.java:2489
+#: build/trans_presets.java:2495 build/trans_presets.java:2501
+#: build/trans_presets.java:2523 build/trans_presets.java:2530
+#: build/trans_presets.java:2537 build/trans_presets.java:2543
+#: build/trans_presets.java:2550 build/trans_presets.java:2556
+#: build/trans_presets.java:2562 build/trans_presets.java:2568
+#: build/trans_presets.java:2574 build/trans_presets.java:2580
+#: build/trans_presets.java:2587 build/trans_presets.java:2594
+#: build/trans_presets.java:2601 build/trans_presets.java:2607
+#: build/trans_presets.java:2613 build/trans_presets.java:2619
+#: build/trans_presets.java:2625 build/trans_presets.java:2631
+#: build/trans_presets.java:2638 build/trans_presets.java:2645
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2664 build/trans_presets.java:2674
+#: build/trans_presets.java:2683 build/trans_presets.java:2698
+#: build/trans_presets.java:2704 build/trans_presets.java:2712
+#: build/trans_presets.java:2719 build/trans_presets.java:2739
+#: build/trans_presets.java:2749 build/trans_presets.java:2755
+#: build/trans_presets.java:2761 build/trans_presets.java:2767
+#: build/trans_presets.java:2773 build/trans_presets.java:2780
+#: build/trans_presets.java:2787 build/trans_presets.java:2794
+#: build/trans_presets.java:2800 build/trans_presets.java:2806
+#: build/trans_presets.java:2814 build/trans_presets.java:2821
+#: build/trans_presets.java:2828 build/trans_presets.java:2835
+#: build/trans_presets.java:2841 build/trans_presets.java:2848
+#: build/trans_presets.java:2855 build/trans_presets.java:2864
+#: build/trans_presets.java:2870 build/trans_presets.java:2876
+#: build/trans_presets.java:2882 build/trans_presets.java:2888
+#: build/trans_presets.java:2897 build/trans_presets.java:2907
+#: build/trans_presets.java:2916 build/trans_presets.java:2922
+#: build/trans_presets.java:2928 build/trans_presets.java:2933
+#: build/trans_presets.java:2939 build/trans_presets.java:2945
+#: build/trans_presets.java:2954 build/trans_presets.java:2960
+#: build/trans_presets.java:2966 build/trans_presets.java:2972
+#: build/trans_presets.java:2978 build/trans_presets.java:2984
+#: build/trans_presets.java:2990 build/trans_presets.java:2997
+#: build/trans_presets.java:3003 build/trans_presets.java:3008
+#: build/trans_presets.java:3015 build/trans_presets.java:3022
+#: build/trans_presets.java:3028 build/trans_presets.java:3037
+#: build/trans_presets.java:3045 build/trans_presets.java:3051
+#: build/trans_presets.java:3057 build/trans_presets.java:3064
+#: build/trans_presets.java:3070 build/trans_presets.java:3077
+#: build/trans_presets.java:3083 build/trans_presets.java:3089
+#: build/trans_presets.java:3095 build/trans_presets.java:3101
+#: build/trans_presets.java:3114 build/trans_presets.java:3128
+#: build/trans_presets.java:3142
 msgid "Name"
 msgstr "Název"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:45
-#, java-format
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50
+#, fuzzy, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
-"<strong>{2}</strong></html>"
+"<strong>{2}</strong> in changeset <strong>{3}</strong>"
 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/VersionTable.java:118
+#, fuzzy
+msgid "Changeset info"
+msgstr "Sada změn {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
+#, fuzzy
+msgid "Launch browser with information about the changeset"
+msgstr "Více informací o tomto přednastavení"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
+#, fuzzy, java-format
+msgid "Show changeset {0}"
+msgstr "Sada změn {0}"
+
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
 #, java-format
@@ -6353,32 +6848,290 @@
 msgstr "Verze {0} vytvořená na {1} uživatelem {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:19
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
 msgid "Version"
 msgstr "Verze"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:278
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+msgid "Launch a file chooser to select a file"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
+#, fuzzy
+msgid "Select filename"
+msgstr "Jméno ulice"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58
+msgid "Yes"
+msgstr "Ano"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:58
+msgid "No"
+msgstr "Ne"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:48
+#, java-format
+msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
+#, java-format
+msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
+#, java-format
+msgid ""
+"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
+#, java-format
+msgid "Layer ''{0}'' has no modifications to be saved"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
+msgid "No file associated with this layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
+#, fuzzy
+msgid "Please select a file"
+msgstr "Vyberte prosím hodnotu"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
+#, fuzzy, java-format
+msgid "Layer ''{0}'' is not backed by a file"
+msgstr "Vrstva ''{0}'' musí být v  seznamu vrstev"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:102
+#, java-format
+msgid "File ''{0}'' is not writable. Please enter another file name."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:116
+#, java-format
+msgid "Select to upload layer ''{0}'' to the server ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
+#, java-format
+msgid "Saving layer to ''{0}'' ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+msgid "Unsaved changes - Save/Upload before exiting?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+msgid "Unsaved changes - Save/Upload before deleting?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+msgid "Uploading and saving modified layers ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#, java-format
+msgid ""
+"<html>{0} layer has unresolved conflicts.<br>Either resolve them first or "
+"discard the modifications.<br>Layer with conflicts:</html>"
+msgid_plural ""
+"<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
+"discard the modifications.<br>Layers with conflicts:</html>"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#, fuzzy
+msgid "Unsafed data and conflicts"
+msgstr "Opravit konflikty značek"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#, java-format
+msgid ""
+"<html>{0} layer needs saving but has no associated file.<br>Either select a "
+"file for this layer or discard the changes.<br>Layer without a file:</html>"
+msgid_plural ""
+"<html>{0} layers need saving but have no associated file.<br>Either select a "
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+msgid "Unsafed data and missing associated file"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#, java-format
+msgid ""
+"<html>{0} layer needs saving but has an associated file<br>which can't be "
+"written.<br>Either select another file for this layer or discard the changes."
+"<br>Layer with a non-writable file:</html>"
+msgid_plural ""
+"<html>{0} layers need saving but have associated files<br>which can't be "
+"written.<br>Either select another file for each of them or discard the "
+"changes.<br>Layers with non-writable files:</html>"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+msgid "Unsafed data non-writable files"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgid "Close this dialog and resume editing in JOSM"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+msgid "Exit JOSM without saving. Unsaved changes are lost."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+#, fuzzy
+msgid "Discard and Delete"
+msgstr "Neuložit změny a ukončit"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
+msgid "Delete layers without saving. Unsaved changes are lost."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+#, fuzzy
+msgid "Save and Delete"
+msgstr "Uložit a ukončit"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#, java-format
+msgid "Preparing layer ''{0}'' for upload ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+msgid ""
+"<html>An upload and/or save operation of one layer with modifications<br>was "
+"cancelled or has been failed.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+msgid "Incomplete upload and/or save"
+msgstr ""
+
+#. item "Streets/Motorway" text "Name"
+#. item "Streets/Motorway Link" label "Edit Motorway Link"
+#. <space />
+#. <key key="highway" value="motorway_link" />
+#. <optional>
+#. item "Streets/Trunk" text "Name"
+#. item "Streets/Trunk Link" text "Reference"
+#. <optional>
+#. item "Streets/Primary" text "Name"
+#. item "Streets/Primary Link" label "Edit Primary Link"
+#. <space />
+#. <key key="highway" value="primary_link" />
+#. <optional>
+#. item "Streets/Secondary" text "Name"
+#. item "Streets/Tertiary" text "Name"
+#. item "Streets/Unclassified" check "Embankment"
+#. item "Streets/Residential" check "Embankment"
+#. item "Streets/Living Street" check "Embankment"
+#. item "Streets/Service" check "Embankment"
+#. item "Streets/Road (Unknown Type)" check "Embankment"
+#. item "Streets/Roundabout" check "Embankment"
+#. item "Streets/Bridge" text "Name"
+#. item "Streets/Tunnel" text "Name"
+#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Bridleway" check "Embankment"
+#. item "Ways/Pedestrian" check "Embankment"
+#. item "Ways/Steps" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. item "Water/Drain" text "Name"
+#. item "Water/Stream" text "Name"
+#. item "Water/Canal" text "Name"
+#. item "Water/River" text "Name"
+#. item "Railway/Bus Guideway" check "Embankment"
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
+#: build/trans_presets.java:67 build/trans_presets.java:84
+#: build/trans_presets.java:103 build/trans_presets.java:122
+#: build/trans_presets.java:143 build/trans_presets.java:159
+#: build/trans_presets.java:180 build/trans_presets.java:200
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:372 build/trans_presets.java:387
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:450 build/trans_presets.java:470
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:528 build/trans_presets.java:549
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:664 build/trans_presets.java:1060
+#: build/trans_presets.java:1068 build/trans_presets.java:1076
+#: build/trans_presets.java:1086 build/trans_presets.java:1305
+msgid "Layer"
+msgstr "Vrstva"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
+#, fuzzy
+msgid "Should upload?"
+msgstr "Při nahrávání"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
+msgid "Should save?"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
+#, fuzzy
+msgid "Filename"
+msgstr "Soubor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#, fuzzy
+msgid "Upload"
+msgstr "Nahrávám"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
+#, fuzzy
+msgid "Preparing primitives to upload ..."
+msgstr "Nejsou vybrány žádné prvky pro aktualizaci."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
 #, java-format
 msgid "Images for {0}"
 msgstr "Obrázky pro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:282
 msgid "Read GPX..."
 msgstr "Číst GPX..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:303
 #, 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:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:308
 #, 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:322
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:321
 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:332
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:331
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:139
 #, java-format
@@ -6386,29 +7139,29 @@
 msgstr "Čtu {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:402
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:246
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:587
 #, java-format
 msgid "GPS start: {0}"
 msgstr "Start GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:589
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:588
 #, java-format
 msgid "GPS end: {0}"
 msgstr "Konec GPS: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
 #, java-format
 msgid "current delta: {0}s"
 msgstr "nynější odchylka: {0}s"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:591
 msgid "timezone difference: "
 msgstr "rozdíl časových pásem: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:284
 msgid "image"
@@ -6418,14 +7171,14 @@
 msgstr[2] "obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:618
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:617
 #, java-format
 msgid "{0} within the track."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:677
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:676
 msgid "Sync clock"
 msgstr "Synchronizovat hodiny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:688
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
@@ -6433,82 +7186,82 @@
 msgstr "JPEG obrázky (*.jpg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:735
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:734
 #, 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:744
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:743
 #, 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:751
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:750
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:753
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:752
 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:756
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:755
 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:768
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:767
 msgid "Synchronize Time with GPS Unit"
 msgstr "Synchronizace času s GPS přijímačem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:790
+#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:797
 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:113
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:125
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 msgid "gps point"
 msgstr "gps bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:118
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
+msgid "Use global settings."
+msgstr "Použít globální nastavení."
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
-msgid "Use global settings."
-msgstr "Použít globální nastavení."
+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:123
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
-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:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 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:138
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:155
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
+#: ../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:160
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../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:164
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
@@ -6571,5 +7324,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
 #, java-format
 msgid "Description: {0}"
@@ -6585,10 +7338,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -6599,11 +7352,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:87
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:207
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:218
@@ -6645,4 +7398,9 @@
 "pokračovat?</html>"
 
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#, fuzzy
+msgid "Download data"
+msgstr "Stahuji data"
+
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
 msgid "No GPX track available in layer to associate audio with."
@@ -6663,64 +7421,64 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:105
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:171
 msgid "outside downloaded area"
 msgstr "mimo stažený areál"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:250
 #, java-format
 msgid "version {0}"
 msgstr "verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:282
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:289
 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:407
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skládá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:411
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 #, java-format
 msgid " ({0} deleted.)"
 msgstr " ({0} smazáno.)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397
 msgid "unset"
 msgstr "nenastaveno"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:415
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397
 #, java-format
 msgid "API version: {0}"
 msgstr "Verze API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:501
 #: ../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:159
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1934
-#: build/trans_presets.java:1940 build/trans_presets.java:1949
-#: build/trans_presets.java:1956 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
-#: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2054 build/trans_presets.java:2060
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
+#: build/trans_presets.java:1923 build/trans_presets.java:1929
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2016
+#: build/trans_presets.java:2023 build/trans_presets.java:2031
+#: build/trans_presets.java:2037 build/trans_presets.java:2043
+#: build/trans_presets.java:2049 build/trans_presets.java:2055
+#: build/trans_presets.java:2061 build/trans_presets.java:2067
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
 msgid "track"
 msgid_plural "tracks"
@@ -6729,5 +7487,5 @@
 msgstr[2] "trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159
 msgid "point"
 msgid_plural "points"
@@ -6736,5 +7494,5 @@
 msgstr[2] "body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:188
 #, java-format
 msgid "a track with {0} point"
@@ -6744,5 +7502,5 @@
 msgstr[2] "trasy s {0} body"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} consists of {1} track"
@@ -6752,5 +7510,5 @@
 msgstr[2] "{0} se skládá z {1} tras"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:192
 #, java-format
 msgid "{0} point"
@@ -6760,9 +7518,9 @@
 msgstr[2] "{0} bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:152
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:151
 msgid "gps marker"
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:172
 msgid "marker"
 msgid_plural "markers"
@@ -6771,5 +7529,5 @@
 msgstr[2] "značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:191
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -6790,5 +7548,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #, java-format
 msgid "Audio synchronized at point {0}."
@@ -6796,5 +7554,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:249
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
 msgid "Unable to synchronize in layer being played."
 msgstr "Není možno synchronizovat v již přehrávané vrstvě"
@@ -6822,5 +7580,5 @@
 msgstr "Přepnout viditelnost textu značek a ikon."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
 msgid ""
 "You need to drag the play head near to the GPX track whose associated sound "
@@ -6828,5 +7586,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
 msgid ""
 "You need to SHIFT-drag the play head onto an audio marker or onto the track "
@@ -6834,29 +7592,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 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:44
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
 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:45
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
 msgid "(URL was: "
 msgstr "(URL bylo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:46
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
 msgid "Error displaying URL"
 msgstr "Chyba při zobrazování URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
 msgstr "Pokročilé volby"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
 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:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
 #: ../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
@@ -6864,26 +7622,26 @@
 msgstr "Hledání: "
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:101
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
 msgid "Current value is default."
 msgstr "Nynějsí hodnota je výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
 #, java-format
 msgid "Default value is ''{0}''."
 msgstr "Výchozí hodnota je''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:106
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 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:223
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:160
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:215
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:157
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:212
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:192
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:654
 msgid "Please select the row to edit."
 msgstr "Zvolte řádek k editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:195
 #, java-format
@@ -6891,14 +7649,14 @@
 msgstr "Nová hodnota pro {0}"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:183
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:235
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:139
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:678
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:96
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:92
 msgid "Please select the row to delete."
 msgstr "Zvolte řádek k vymazání"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:270
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
 msgid "Enter a new key/value pair"
 msgstr "Zadejte novou dvojici klíč/hodnota"
@@ -7021,40 +7779,40 @@
 msgstr "Kalibrace nahrávání zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
 msgid "Color"
 msgstr "Barva"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:136
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Styl kreslení {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:143
 #, java-format
 msgid "Layer: {0}"
 msgstr "Vrstva: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153
 msgid "Choose"
 msgstr "Vybrat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:160
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Zvolte barvu pro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:168
 msgid "Set to default"
 msgstr "Nastavit na výchozí hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:179
 msgid "Set all to default"
 msgstr "Nastavit vše na výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:230
 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:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:245
 msgid "Colors"
 msgstr "Barvy"
@@ -7099,5 +7857,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1374
 msgid "Car"
 msgstr "Auto"
@@ -7119,16 +7877,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:323 build/trans_presets.java:649
-#: build/trans_presets.java:852 build/trans_presets.java:871
-#: build/trans_presets.java:885 build/trans_presets.java:907
-#: build/trans_presets.java:944 build/trans_presets.java:957
-#: build/trans_presets.java:969 build/trans_presets.java:981
-#: build/trans_presets.java:993 build/trans_presets.java:1005
-#: build/trans_presets.java:1015 build/trans_presets.java:1024
-#: build/trans_presets.java:1033 build/trans_presets.java:1425
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:324 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038 build/trans_presets.java:1437
+#: build/trans_presets.java:1510
 msgid "Bicycle"
 msgstr "Cyklisté"
 
+#. item "Ways/Path" label "Type"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -7158,12 +7917,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:651
-#: build/trans_presets.java:851 build/trans_presets.java:870
-#: build/trans_presets.java:884 build/trans_presets.java:906
-#: build/trans_presets.java:943 build/trans_presets.java:956
-#: build/trans_presets.java:968 build/trans_presets.java:980
-#: build/trans_presets.java:992 build/trans_presets.java:1004
-#: build/trans_presets.java:1014 build/trans_presets.java:1023
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:325 build/trans_presets.java:649
+#: build/trans_presets.java:856 build/trans_presets.java:875
+#: build/trans_presets.java:889 build/trans_presets.java:911
+#: build/trans_presets.java:948 build/trans_presets.java:961
+#: build/trans_presets.java:973 build/trans_presets.java:985
+#: build/trans_presets.java:997 build/trans_presets.java:1009
+#: build/trans_presets.java:1019 build/trans_presets.java:1028
+#: build/trans_presets.java:1037
 msgid "Foot"
 msgstr "Pěší"
@@ -7341,5 +8100,5 @@
 #. Show splash screen on startup
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79
 msgid "Show splash screen at startup"
 msgstr "Zobrazovat při startu úvodní obrazovku"
@@ -7347,23 +8106,34 @@
 #. Show ID in selection
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84
 msgid "Show object ID in selection lists"
 msgstr "Zobrazovat ID objektů v seznamech"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:87
+#, fuzzy
+msgid "Show localized name in selection lists"
+msgstr "Zobrazovat ID objektů v seznamech"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93
 msgid "Draw rubber-band helper line"
 msgstr "Vykreslovat pomocnou čáru od posledního bodu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42
 msgid "Modeless working (Potlatch style)"
 msgstr "Nepoužívat módy (styl Potlachu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:91
+#. Show localized names
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89
+#, fuzzy
+msgid "Show localized name in selection lists, if available"
+msgstr "Zobrazovat ID objektů v seznamech"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
 msgid "Do not require to switch modes (potlatch style workflow)"
 msgstr "Práce bez přepínání režimů (ve stylu potlatche)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
 msgid "Look and Feel"
 msgstr "Vzhled a chování"
@@ -7395,54 +8165,54 @@
 msgstr "Použitý styl"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
 msgid "Configure available plugins."
 msgstr "Nastavení dostupných pluginů."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
 msgid "Download List"
 msgstr "Stáhnout seznam"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:67
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
 msgid "Configure Sites..."
 msgstr "Konfigurovat zařízení..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+msgid "Add JOSM Plugin description URL."
+msgstr ""
+
 #: ../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:93
 msgid "Enter URL"
 msgstr "Zadat URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
 msgid "Please select an entry."
 msgstr "Prosím, vyberte položku."
 
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+msgid "Edit JOSM Plugin description URL."
+msgstr ""
+
 #: ../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:115
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
 msgid "Configure Plugin Sites"
 msgstr "Nastavení webů s pluginy"
 
 #. some common tabs
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid "Display Settings"
 msgstr "Nastavení zobrazení"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:42
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
 msgid ""
 "Various settings that influence the visual representation of the whole "
@@ -7450,41 +8220,41 @@
 msgstr "Různá nastavení ovlivňující vzhled celého programu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Connection Settings"
 msgstr "Nastavení připojení"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
 msgid "Connection Settings for the OSM server."
 msgstr "Nastavení připojení pro OSM server."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
 msgid "Map Settings"
 msgstr "Nastavení mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
 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:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
 msgid "Audio Settings"
 msgstr "Nastavení zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:46
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:106
 msgid "You have to restart JOSM for some settings to take effect."
 msgstr "Některá nastavení se projeví až po restartování JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:54
 msgid "Display coordinates as"
 msgstr "Zobrazovat souřadnice jako"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:57
 msgid "Projection method"
 msgstr "Metoda projekce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:64
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:62
 msgid "Map Projection"
 msgstr "Projekce mapy"
@@ -7517,12 +8287,4 @@
 msgid "Proxy server password"
 msgstr "Heslo pro proxy"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Základní URL OSM serveru (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:38
-msgid "Base Server URL"
-msgstr "URL serveru"
 
 #. 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
@@ -7549,61 +8311,60 @@
 msgstr "Klávesová zkratka"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
 #, java-format
 msgid "Short Description: {0}"
 msgstr "Krátká popiska: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:64
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
 #, java-format
 msgid "URL: {0}"
 msgstr "URL: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:63
 #, java-format
 msgid "Author: {0}"
 msgstr "Autor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:66
 #, java-format
 msgid "Webpage: {0}"
 msgstr "Webová stránka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:72
 #, java-format
 msgid "Version: {0}"
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:293
 msgid "Icon paths"
 msgstr "Cesty k ikonám"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
 msgid "Copy defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:251
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
 msgid "Please select the row to copy."
 msgstr "Vyberte řádek ke zkopírování."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:273
 #, java-format
 msgid "The XML source (URL or filename) for {0} definition files."
 msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:277
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
 msgid "Add a new XML source to the list."
 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
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:275
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:689
 msgid "Delete the selected source from the list."
 msgstr "Smazat vybraný zdroj ze seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:284
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:281
 msgid "Defaults (See tooltip for detailed information)"
 msgstr ""
@@ -7771,36 +8532,60 @@
 msgstr "Skupiny modifikátorů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:414
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:70
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:72
+msgid "<multiple>"
+msgstr "<mnohonásobný>"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:351
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#, java-format
+msgid "Remove old keys from up to {0} object"
+msgid_plural "Remove old keys from up to {0} objects"
+msgstr[0] "Odstranit staré klíče z {0} objektů"
+msgstr[1] "Odstranit staré klíče z {0} objektu"
+msgstr[2] "Odstranit staré klíče z {0} objektů"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#, fuzzy
+msgid "Add a new tag"
+msgstr "Přidat novou vrstvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#, fuzzy
+msgid "Delete the selection in the tag table"
+msgstr "Smazat označenou vrstvu."
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:434
 msgid "More information about this feature"
 msgstr "Více informací o tomto přednastavení"
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:432
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:452
 msgid "Optional Attributes:"
 msgstr "Volitelné atributy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:478
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:498
 #, 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:479
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:499
 #, java-format
 msgid "Use preset ''{0}''"
 msgstr "Použít přednastavení \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:519
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:539
 msgid "closedway"
 msgstr "uzavřená cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:524
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:544
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:603
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:623
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -7808,15 +8593,15 @@
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:611
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:631
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:639
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
 #, 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:670
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:702
 #: ../plugins/terracer/src/terracer/TerracerAction.java:98
 #, java-format
@@ -7827,22 +8612,22 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:673
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #: ../plugins/terracer/src/terracer/TerracerAction.java:100
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:707
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:683
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:715
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:756
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:790
 msgid "Change Properties"
 msgstr "Změnit vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
 #, java-format
 msgid "Preset group ''{0}''"
@@ -7881,11 +8666,11 @@
 #: ../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
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:38
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:184
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nemůžu číst \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:40
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:39
 msgid ""
 "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -7895,38 +8680,38 @@
 "licencované pod GPL."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:43
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:42
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:24
 msgid "GPX Files"
 msgstr "GPX soubory"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:72
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
 msgid "gps track description"
 msgstr "popis gps trasy"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:78
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77
 msgid "Add author information"
 msgstr "Přidat informace autora"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:81
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80
 msgid "Real name"
 msgstr "Skutečné jméno"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84
 msgid "E-Mail"
 msgstr "Email"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:89
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88
 msgid "Copyright (URL)"
 msgstr "Copyright (URL)"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:93
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92
 msgid "Predefined"
 msgstr "Předdefinováno"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:95
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94
 msgid "Copyright year"
 msgstr "Copyright"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:111
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110
 msgid "Keywords"
 msgstr "Klíčová slova"
@@ -7936,9 +8721,9 @@
 msgstr "Nastavení Exportu"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 msgid "Export and Save"
 msgstr "Exportovat a uložit"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:171
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175
 #, java-format
 msgid ""
@@ -7949,10 +8734,10 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:254
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:258
 msgid "Choose a predefined license"
 msgstr "Zvolte předdefinovanou licenci"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:51
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:57
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
 #: ../plugins/dataimport/src/org/openstreetmap/josm/io/Tcx.java:82
@@ -7962,12 +8747,12 @@
 msgstr "Značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:39
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:71
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:41
 #, java-format
 msgid "File \"{0}\" does not exist"
 msgstr "Soubor \"{0}\" neexistuje"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:61
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:42
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:44
 #, java-format
 msgid "Parsing file \"{0}\" failed"
@@ -7989,6 +8774,6 @@
 "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/MultiFetchServerObjectReader.java:325
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:348
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:36
@@ -7998,20 +8783,40 @@
 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
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:375
+#, java-format
+msgid "Fetching node with id {0} from ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
+#, java-format
+msgid "Fetching way with id {0} from ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:377
+#, fuzzy, java-format
+msgid "Fetching relation with id {0} from ''{1}''"
+msgstr "Upravit relaci #{0} ve vrstvě \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:383
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
 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
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413
+#, java-format
+msgid "Fetching a package of nodes from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:414
+#, java-format
+msgid "Fetching a package of ways from ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:415
+#, fuzzy, java-format
+msgid "Fetching a package of relations from ''{0}''"
+msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:426
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -8021,34 +8826,34 @@
 "pro každý prvek"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
 msgid "NMEA-0183 Files"
 msgstr "NMEA-0183 soubory"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
 #: ../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:44
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
 msgid "Malformed sentences: "
 msgstr "Poškozené věty: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
 msgid "Checksum errors: "
 msgstr "Chyby v kontrolním součtu: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:46
 msgid "Unknown sentences: "
 msgstr "Neznámé věty: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:48
 msgid "Zero coordinates: "
 msgstr "Nulové souřadnice: "
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:53
 msgid "NMEA import success"
 msgstr "NMEA import úspěšný"
 
-#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:56
 msgid "NMEA import faliure!"
 msgstr "NMEA import selhal!"
@@ -8059,9 +8864,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr "Tato verze JOSM není kompatibilní s nakonfigurovaným serverem."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:174
 #, java-format
 msgid ""
@@ -8072,15 +8877,15 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:177
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:178
 #, java-format
 msgid "Communications with {0} established using protocol version {1}"
 msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:238
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:262
 #, java-format
 msgid ""
@@ -8089,33 +8894,91 @@
 "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:286
-msgid "Opening changeset..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:299
+#, fuzzy
+msgid "Creating changeset..."
 msgstr "Otevírám sadu změn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:305
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:316
+#, java-format
+msgid "Successfully opened changeset {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+msgid "No currently open changeset. Opening a new changeset..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:310
+msgid ""
+"Warning: could not reuse an existing changeset as requested. Opening a new "
+"one."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:318
+#, fuzzy, java-format
+msgid "Reusing existing changeset {0}"
+msgstr "Otevírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:336
+#, fuzzy
+msgid "Updating changeset..."
+msgstr "Otevírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:340
+#, java-format
+msgid "Changeset {0} is unchanged. Skipping update."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#, fuzzy, java-format
+msgid "Updating changeset {0}..."
+msgstr "Otevírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
+msgid ""
+"Failed to update changeset. Either there is no current changeset or the id "
+"of the current changeset is 0"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373
 msgid "Closing changeset..."
 msgstr "Zavírám sadu změn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:327
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:376
+#, fuzzy, java-format
+msgid "Closing changeset {0}..."
+msgstr "Zavírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:382
+#, fuzzy, java-format
+msgid "Leaving changeset {0} open..."
+msgstr "Otevírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401
 msgid "No changeset present for diff upload"
 msgstr "Není k dizpozici sada změn pro rozdílový upload"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:334
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
 msgid "Preparing..."
 msgstr "Připravuji..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:413
 msgid "Uploading..."
 msgstr "Nahrávám..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:361
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:435
 msgid "Waiting 10 seconds ... "
 msgstr "Čekám 10 sekund ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:369
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
+#, fuzzy, java-format
+msgid "Starting retry {0} of {1} in {2} seconds ..."
+msgstr "Zahajuji pokus {0} z {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
 msgid "OK - trying again."
 msgstr "OK - další pokus."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:515
 #, java-format
 msgid "Starting retry {0} of {1}."
@@ -8143,29 +9006,33 @@
 msgstr "poškozený bz2 soubor."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
 msgid "Incorrect password or username."
 msgstr "Nesprávné heslo nebo uživatelské jméno"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Upozornění: heslo je posíláno nezašifrované."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
 msgid "Save user and password (unencrypted)"
 msgstr "Uložit uživatelské jméno a heslo (nezašifrované)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
 msgid "Enter Password"
 msgstr "Zadejte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Login"
 msgstr "Přihlásit se"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:229
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+msgid "The base URL for the OSM server (REST API)"
+msgstr "Základní URL OSM serveru (REST API)"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:230
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8173,13 +9040,17 @@
 "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+msgid "Base Server URL"
+msgstr "URL serveru"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
 msgid "OSM username (e-mail)"
 msgstr "Uživatelské jméno (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:233
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
 msgid "OSM password"
 msgstr "OSM heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:235
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8191,20 +9062,20 @@
 "<br><b>Nepoužívejte hesla která chcete utajit.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
-#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:23
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:25
 msgid "OSM Server Files"
 msgstr "Soubory z OSM serveru"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:46
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:45
 #, java-format
 msgid "Expected instance of OsmDataLayer. Got ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:83
 #, java-format
 msgid "<html>An error occurred while saving.<br>Error is: <br>{0}</html>"
 msgstr "<html>Při ukládání došlo k chybě.<br>Chyba: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:98
 #, java-format
 msgid ""
@@ -8214,5 +9085,5 @@
 "<html>Došlo k chybě při obnovování zálohy souboru.<br>Chyba: <br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:113
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
@@ -8414,35 +9285,46 @@
 "internetu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:98
-#, java-format
-msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104
+#, fuzzy, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 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
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:105
+#, fuzzy, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:106
+#, fuzzy, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), zbývá {3} . Nahrávám {4}: {5} (id: {6})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:189
 #, java-format
 msgid ""
 "WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
-"use changesets, but API is not able to handle them. Ignoring changesets."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+"use diff uploads, but API is not able to handle them. Ignoring diff upload."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:194
+#, fuzzy
+msgid "Starting to upload in one request ..."
+msgstr "Není nic k nahrání. Nejprve musíte mít nějaká data."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:197
+msgid "Starting to upload with one request per primitive ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
 msgid "Update Plugins"
 msgstr "Aktualizuj pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:43
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
 msgid "Download Plugins"
 msgstr "Stáhnout pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:55
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:54
 #, java-format
 msgid ""
@@ -8455,5 +9337,5 @@
 " {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:61
 #, java-format
 msgid "{0} Plugin successfully downloaded. Please restart JOSM."
@@ -8463,23 +9345,23 @@
 msgstr[2] "{0} Pluginů bylo úspěšně staženo. Prosím restartujte JOSM."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:76
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:75
 #, java-format
 msgid "Downloading Plugin {0}..."
 msgstr "Stahuji Plugin {0}..."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:125
 msgid "Skip download"
 msgstr "Přeskočit stahování"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:126
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
 msgstr "Pro plugin {1} je třeba JOSM verze {0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 msgid "Download Plugin"
 msgstr "Stáhnout Plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:128
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:127
 msgid "Skip Download"
 msgstr "Přeskočit stahování"
@@ -8490,30 +9372,30 @@
 msgstr "Nastala chyba v pluginu {0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:71
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:70
 #, java-format
 msgid "Loading of {0} plugin was requested. This plugin is no longer required."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:91
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:90
 #, java-format
 msgid "Plugin {0} requires JOSM update to version {1}."
 msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:109
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
 #, 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:124
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:123
 #, java-format
 msgid "Plugin not found: {0}."
 msgstr "Následující plugin nenalezen:{0}."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
 #, 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:143
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:142
 msgid ""
 "(You can change the number of days after which this warning appears<br>by "
@@ -8523,21 +9405,21 @@
 "'pluginmanager.warntime'.)"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:175
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:281
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
 msgid "Disable plugin"
 msgstr "Zakázat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:176
 #, 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:178
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:177
 msgid "Keep plugin"
 msgstr "Ponechat plugin"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:220
 msgid ""
 "Activating the updated plugins failed. Check if JOSM has the permission to "
@@ -8547,5 +9429,5 @@
 "jejich přepsání."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:283
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:282
 #, java-format
 msgid ""
@@ -8554,10 +9436,10 @@
 "Nastala neočekávaná výjimka, která by mohla pocházet z pluginu ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:285
 #, 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:289
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:288
 msgid ""
 "Try updating to the newest version of this plugin before reporting a bug."
@@ -8565,9 +9447,9 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu, než ohlásíte chybu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
 msgid "Should the plugin be disabled?"
 msgstr "Chcete plugin zakázat ?"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:300
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:299
 msgid ""
 "The plugin has been removed from the configuration. Please restart JOSM to "
@@ -8577,13 +9459,13 @@
 "programu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:306
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:305
 msgid "The plugin could not be removed. Probably it was already disabled"
 msgstr "Plugin nelze odstranit. Pravděpodobně je již neaktivní."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:350
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:349
 msgid "Plugin information"
 msgstr "Informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:356
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:355
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
@@ -8594,5 +9476,5 @@
 msgstr "Více detailů"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:53
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -8602,18 +9484,18 @@
 msgstr[2] "Informace o pluginech staženy z {0} sití"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 msgid "No plugin information found."
 msgstr "Nenalezeny informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:82
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in {0} je nedostupný. Aktualizace přeskočena."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
 msgid "All installed plugins are up to date."
 msgstr "Všechny nainstalované pluginy jsou aktuální."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:102
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 #, java-format
 msgid ""
@@ -8626,9 +9508,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:137
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
 msgid "Download missing plugins"
 msgstr "Stáhnout chybějící pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
 #, java-format
 msgid ""
@@ -8641,35 +9523,35 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:213
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Verze {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:221
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin zahrnut v JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:354
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
 #, 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:302
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301
 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:344
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
 msgid "Error playing sound"
 msgstr "Chyba přehrávání zvuku"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53
 msgid "Do nothing"
 msgstr "Nedělat nic"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:53
 msgid "Report Bug"
 msgstr "Nahlásit chybu"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:55
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54
 msgid ""
 "An unexpected exception occurred.\n"
@@ -8683,18 +9565,18 @@
 "verzi JOSM, buďte tak laskavi a chybu nahlašte."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:58
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:57
 msgid "Unexpected Exception"
 msgstr "Neočekávaná výjimka"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:68
 #, java-format
 msgid "Please report a ticket at {0}"
 msgstr "Prosíme oznamte chybu na {0}"
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
 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:71
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
 msgid ""
 "Try updating to the newest version of JOSM and all plugins before reporting "
@@ -8703,19 +9585,19 @@
 "Zkuste aktualizovat na nejnovější verzi tohoto pluginu před hlášením chyby."
 
-#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:72
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:71
 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:77
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:76
 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/I18n.java:119
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:120
 #, 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
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
 #, java-format
 msgid ""
@@ -8724,5 +9606,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:201
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
 #, java-format
 msgid ""
@@ -8731,5 +9613,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:447
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
 #, java-format
 msgid ""
@@ -8742,5 +9624,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:452
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
 msgid ""
 "This action will have no shortcut.\n"
@@ -8750,5 +9632,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:454
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
 #, java-format
 msgid ""
@@ -8759,21 +9641,56 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: Klávesové zkratky lze změnit v nastavení.)"
 
-#: ../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
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:75
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:87
 #, 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
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:80
 #, java-format
 msgid ""
 "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
 "was: {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:99
+#, java-format
+msgid ""
+"preference with key ''{0}'' doesn''t include ''{1}''. Can''t restore window "
+"geometry from preferences."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:105
+#, java-format
+msgid ""
+"preference with key ''{0}'' doesn''t provide an int value for ''{1}''. Got "
+"{2}. Can''t restore window geometry from preferences."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
+#, java-format
+msgid ""
+"failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"{2}. Can''t restore window geometry from preferences."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:114
+#, java-format
+msgid ""
+"preference with key ''{0}'' doesn''t exist. Can''t restore window geometry "
+"from preferences."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:153
+#, java-format
+msgid ""
+"Warning: failed to restore window geometry from key ''{0}''. Falling back to "
+"default geometry. Details: {1}"
 msgstr ""
 
@@ -8800,9 +9717,27 @@
 msgstr "Vytvořit mřížku cest"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:70
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
+msgid "Private (only shared as anonymous, unordered points)"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60
+msgid "Public (shown in trace list and as anonymous, unordered points)"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61
+msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62
+msgid ""
+"Identifiable (shown in trace list and as identifiable, ordered points with "
+"timestamps)"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
 msgid "Upload Trace"
 msgstr "Nahrát trasy"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:81
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -8810,27 +9745,40 @@
 msgstr "Nahrát trasy na server"
 
-#: ../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:99
-msgid "Selected makes your trace public in openstreetmap.org"
-msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org"
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:134
+msgid "Visibility"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+msgid "Defines the visibility of your trace for other OSM users."
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
+#, fuzzy
+msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+msgstr "http://www.openstreetmap.org/traces"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:139
+msgid "(What does that mean?)"
+msgstr ""
 
 #. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:101
-#: build/trans_presets.java:3017
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:141
+#: build/trans_presets.java:3145
 msgid "Description"
 msgstr "Popis"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:102
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
 msgid "Please enter Description about your trace."
 msgstr "Prosím zadejte popis vaší trasy"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:105
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:144
+msgid "Tags (comma delimited)"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 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:150
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:192
 #, java-format
 msgid "Selected track: {0}"
@@ -8838,47 +9786,47 @@
 
 #. Set progress dialog to indeterminate while connecting
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:173
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:215
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:196
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:238
 msgid "Upload cancelled"
 msgstr "Nahrávání přerušeno"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:206
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:248
 msgid "Error while uploading"
 msgstr "Chyba při nahrávání na server"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:260
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:302
 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:261
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
 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:303
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:345
 #, 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:335
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:377
 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:338
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:360
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:380
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:402
 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:341
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:383
 msgid "No username provided."
 msgstr "Není zadáno uživatelské jméno."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:344
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:386
 msgid "No password provided."
 msgstr "Není zadáno heslo."
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:376
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:418
 msgid "Uploading GPX Track"
 msgstr "Nahrávám GPX trasu na server"
@@ -8991,19 +9939,19 @@
 msgstr "Otevřít skupinu obrázků jako novou vrstvu."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:131
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:130
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Soubory GPX (*.gpx *.gpx.gz)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:152
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:151
 #, 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:176
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:175
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba při parsování {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:224
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:223
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9015,34 +9963,34 @@
 "pásmo<hr></html>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:242
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:241
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:257
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:256
 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:269
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:268
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/rrrr hh:mm:ss]"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:277
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:276
 msgid "I'm in the timezone of: "
 msgstr "Jsem v časovém pásmu: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:340
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:376
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:339
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:375
 msgid "No date"
 msgstr "Žádné datum"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:349
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:348
 msgid "Open an other photo"
 msgstr "Otevřít další fotografie"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:390
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:389
 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:404
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:403
 msgid ""
 "Error while parsing the date.\n"
@@ -9052,69 +10000,69 @@
 "Prosíme, použijte požadvaný formát"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:406
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:405
 msgid "Invalid date"
 msgstr "Neplatné datum"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:449
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:448
 msgid "<No GPX track loaded yet>"
 msgstr "<Není nahraná GPX trasa>"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:455
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:454
 msgid "GPX track: "
 msgstr "GPX trasa: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:460
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:459
 msgid "Open another GPX trace"
 msgstr "Otevřít jinou GPX trasu"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:476
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:475
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:498
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:497
 msgid "Offset:"
 msgstr "Posun:"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:510
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:509
 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:527
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:526
 msgid "Update position for: "
 msgstr "Aktualizovat pozici pro: "
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:536
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:535
 msgid "All images"
 msgstr "Všechny obrázky"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:546
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:545
 msgid "Images with no exif position"
 msgstr "Obrázky bez exif pozice"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:556
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:555
 msgid "Not yet tagged images"
 msgstr "Neotagované obrázky"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:576
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:575
 msgid "Correlate images with GPX track"
 msgstr "Korelovat obrázky s GPX trasou"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 msgid "Correlate"
 msgstr "Korelovat"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:578
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
 msgid "Auto-Guess"
 msgstr "Auto-odhad"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:587
 msgid "You should select a GPX track"
 msgstr "Měli byste vybrat GPX trasu"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:589
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:588
 msgid "No selected GPX track"
 msgstr "Není vybrána GPX trasa"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:600
 #, java-format
 msgid ""
@@ -9125,9 +10073,9 @@
 "Očekávaný formát: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:602
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:601
 msgid "Invalid timezone"
 msgstr "Nepatné časové pásmo"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:613
 #, java-format
 msgid ""
@@ -9138,65 +10086,65 @@
 "Očekávaný formát: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:615
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:614
 msgid "Invalid offset"
 msgstr "Neplatný posun"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:657
 #, 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:659
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:658
 msgid "GPX Track loaded"
 msgstr "Nahrána GPX trasa"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:693
 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:695
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:694
 msgid "Photos don't contain time information"
 msgstr "Fotografie neobsahují informace o čase"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:730
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:728
 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:731
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:729
 msgid "GPX Track has no time information"
 msgstr "GPX trasa neobsahuje časové údaje"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:774
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časová zóna: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:777
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:775
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuty: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:778
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:776
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekundy: {0}"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:795
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:793
 #, 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:798
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:796
 #, java-format
 msgid "(Time difference of {0} days)"
 msgstr "(Časový rozdíl {0} dnů)"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:805
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:803
 #, 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:867
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:865
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9204,13 +10152,13 @@
 msgstr ""
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:869
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:867
 msgid "Matching photos to track failed"
 msgstr "Dosazení fotografií do trasy selhalo."
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:883
 msgid "Adjust timezone and offset"
 msgstr "Upravit časovou zónu a posun"
 
-#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:887
+#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:885
 msgid "Default Values"
 msgstr "Výchozí hodnoty"
@@ -9231,5 +10179,5 @@
 msgstr "Chyba v souboru {0}"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:84
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:86
 #, java-format
 msgid ""
@@ -9242,12 +10190,11 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:89
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:382
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
-msgstr "Vybrat vše"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:126
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:351
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:413
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
@@ -9276,8 +10223,8 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:77
-#, java-format
-msgid ""
-"Town/city {0} not found or not available in WMS.\n"
-"Please check its availibility on www.cadastre.gouv.fr"
+#, fuzzy, java-format
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
 msgstr ""
 "Město {0} nenalezeno, nebo není dostupné ve WMS.\n"
@@ -9288,21 +10235,21 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:361
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:365
 msgid "Select commune"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:350
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
 msgid "Choose from..."
 msgstr "Vyberte z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:131
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:135
 msgid "Cadastre"
 msgstr "Katastr"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:140
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
 msgid "Auto sourcing"
 msgstr "Automatické zdrojování"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:195
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:199
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -9311,37 +10258,48 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:198
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:202
 msgid "Restore grab shortcut F11"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:203
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
 msgid "JOSM is stopped for the change to take effect."
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:269
+#, java-format
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:29
 msgid "Replace original background by JOSM background color."
 msgstr "Nahradit původní pozadí pozadím nastaveným v JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:30
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
 msgid "Reverse grey colors (for black backgrounds)."
 msgstr "Obrácené stupně šedi (pro černá pozadí)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:32
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
 msgid "Set background transparent."
 msgstr "Nastavit průhledné pozadí."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:34
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
 msgid "Draw boundaries of downloaded data."
 msgstr "Zobrazovat hranice stažených dat."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:47
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174
+msgid "Disable image cropping during georeferencing."
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
 msgid "Enable automatic caching."
 msgstr "Zapnout automatické cachování."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:53
 msgid "Max. cache size (in MB)"
 msgstr "Max. velikost cache (v MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:58
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:61
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -9353,19 +10311,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:66
 msgid "French cadastre WMS"
 msgstr "WMS francouzského katastru"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr ""
 "<html>Hodnota klíče \"source\" pokud je zapnuto automatické zdrojování</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:172
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -9374,5 +10332,5 @@
 "Nahradit původní bílé pozadí barvou pozadí nastavenou v nastavení JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -9382,42 +10340,40 @@
 "texty na tmavém pozadí."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
 msgid "Allows multiple layers stacking"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:95
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr ""
 "Nastavení průhlednosti WMS vrstvy. Vpravo je neprůhledné, vlevo průhledné."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Zobrazovat rámeček kolem dat stažených z WMS serveru."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:109
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:115
 msgid "Vector images grab multiplier:"
-msgstr "Násobič rychlého přehrávání"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:128
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:130
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138
 msgid "Fixed size square (default is 100m)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:152
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158
-#, fuzzy
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
 msgid "Raster images grab multiplier:"
-msgstr "Násobič rychlého přehrávání"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:194
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr ""
@@ -9474,12 +10430,10 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
-#, fuzzy
 msgid "Contacting cadastre WMS ..."
-msgstr "Kontaktuji WMS server..."
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
-#, fuzzy
 msgid "Image already loaded"
-msgstr "obrázek nebyl nahrán"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
@@ -9513,20 +10467,20 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:37
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:85
 msgid ""
 "To enable the cadastre WMS plugin, change\n"
 "the current projection to one of the cadastre\n"
-"projection and retry"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:44
+"projections and retry"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
 msgid "Grab non-georeferenced image"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:65
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:68
 msgid "Georeferencing interrupted"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:95
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:157
 msgid ""
 "Click first corner for image cropping\n"
@@ -9534,9 +10488,14 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:116
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177
+msgid "Image cropping"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176
 msgid "Click second corner for image cropping"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:123
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196
 msgid ""
 "Click first Lambert crosspiece for georeferencing\n"
@@ -9544,31 +10503,39 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:132
-msgid "Click second Lambert crosspiece for georeferencing\n"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:197
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216
+msgid "Image georeferencing"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249
+msgid "Enter cadastre east,north position"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:250
+msgid "(Warning: verify north with arrow !!)"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252
+msgid "East"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253
+msgid "North"
+msgstr ""
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
 #, fuzzy
-msgid "Enter cadastre east,north position"
-msgstr "Zadejte šířku/délku místa kam skočit."
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:149
-msgid "(Warning: verify north with arrow !!)"
-msgstr ""
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:151
-#, fuzzy
-msgid "East"
-msgstr "východ"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:152
-#, fuzzy
-msgid "North"
-msgstr "sever"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:162
-#, fuzzy
-msgid "Set Lambert coordinate"
-msgstr "Ponechat cizí souřadnice"
+msgid "Set "
+msgstr "Vybrat"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -9632,6 +10599,6 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:58
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:136
+#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:137
 #, java-format
 msgid "Simplify Way (remove {0} node)"
@@ -9656,6 +10623,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:72
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:68
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:73
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
 msgid "Blank Layer"
 msgstr "Prázdná vrstva"
@@ -9671,7 +10638,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:184
-#, fuzzy, java-format
+#, java-format
 msgid "Raster size: {0}"
-msgstr "Katastr: {0}"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
@@ -10198,6 +11165,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3441
-#: build/trans_style.java:3449
+#: build/trans_style.java:1023 build/trans_style.java:3392
+#: build/trans_style.java:3400
 msgid "water"
 msgstr "voda"
@@ -10210,8 +11177,4 @@
 msgid "land"
 msgstr "země"
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-msgid "none"
-msgstr "nic"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:40
@@ -10506,9 +11469,9 @@
 msgstr "Stahovací smyčka OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:105
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:108
 msgid "Displays OpenStreetBugs issues"
 msgstr "Zobrazuje chyby z OpenStreetBugs"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:94
 msgid ""
 "<html>The openstreetbus plugin is using the old server at appspot.com.<br>A "
@@ -10520,5 +11483,5 @@
 "nový? (Velice doporučujeme)</html>"
 
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
 msgid "Switch to new openstreetbugs server?"
 msgstr "Přepnout na nový openstreetbugs server?"
@@ -11093,5 +12056,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2261
 msgid "Street name"
 msgstr "Jméno ulice"
@@ -11110,29 +12073,29 @@
 msgstr "Zobrazit panel autorů"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:98
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:89
 msgid "Open User Page"
 msgstr "Otevřít stránku uživatele"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:99
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:90
 msgid "Open User Page in browser"
 msgstr "Otevřít stránku uživatele v prohlížeči"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:112
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:103
 msgid "Select User's Data"
 msgstr "Vybrat data uživatele"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:113
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:104
 msgid "Replaces Selection with Users data"
 msgstr "Nahradí výběr uživatelskými daty"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:148
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:130
 msgid "Please select some data"
 msgstr "Vyberte nějaká data"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:152
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:134
 msgid "Please choose a user using the author panel"
 msgstr "Vyberte uživatele v panelu autorů"
 
-#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:165
+#: ../plugins/usertools/src/usertools/UserToolsPlugin.java:147
 msgid "Sorry, doesn't work with anonymous users"
 msgstr "Sorry, nefunguje s anonymními uživateli."
@@ -11146,25 +12109,15 @@
 msgstr "Spojí plochy, které se navzájem překrývají"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
-msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-msgstr ""
-"TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před nahráním "
-"na server."
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:112
-msgid "Continue anyway"
-msgstr "Přesto pokračovat"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:134
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:127
 msgid "Only up to two areas can be joined at the moment."
 msgstr "Aktuálně lze sloučit maximálně pouze dvě plochy."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:139
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:132
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
 msgstr "\"{0}\" není uzavřená plocha a tedy nelze spojit."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:156
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:149
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:65
 msgid ""
 "The selected way(s) have nodes outside of the downloaded data region.\n"
@@ -11176,38 +12129,38 @@
 "Opravdu chcete pokračovat?"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:159
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:152
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:68
 msgid "Please abort if you are not sure"
 msgstr "Prosíme přerušte, pokud si nejste jisti"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:166
 msgid "Please select at least one closed way the should be joined."
 msgstr "Vyberte alespoň jednu uzavřenou cestu k připojení."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:181
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:174
 msgid "No intersection found. Nothing was changed."
 msgstr "Nenalezen žádný průnik. Nic se nemění."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:203
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:196
 msgid "Added node on all intersections"
 msgstr "Přidány body na všechny průsečíky"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:227
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:220
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:232
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:225
 msgid "Fix relations"
 msgstr "Opravit relace."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:230
 msgid "Joined self-overlapping area"
 msgstr "Spojena plocha překrývající sama sebe"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:238
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
 msgid "Joined overlapping areas"
 msgstr "Spojeny překrývající se plochy"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:242
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:235
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -11217,81 +12170,81 @@
 "tímto nedošlo ke vzniku chyb."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:317
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:311
 msgid "Fix tag conflicts"
 msgstr "Opravit konflikty značek"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:465
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:459
 msgid "Removed Element from Relations"
 msgstr "Prvek odstraněn z relací"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:574
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:568
 msgid "Join Areas: Remove Short Ways"
 msgstr "Spojit plochy: Vymazat krátké cesty"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:590
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:584
 msgid "Closed Way"
 msgstr "Uzavřená cesta"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:857
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:851
 msgid "Remove tags from inner ways"
 msgstr "Odstranit tagy z vnitřních cest"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:886
+#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:880
 msgid "Join Areas Function"
 msgstr "Funkce spojení ploch"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 msgid "Jump To Position"
 msgstr "Skok na pozici"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:31
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
 msgid "Opens a dialog that allows to jump to a specific location"
 msgstr "Otevře dialog umožňující skočit na zadané místo"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:54
 msgid "Enter Lat/Lon to jump to position."
 msgstr "Zadejte šířku/délku místa kam skočit."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:56
 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:89
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
 msgstr "Přiblížení (v metrech)"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 msgid "Jump there"
 msgstr "Skočit tam"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:101
 msgid "Jump to Position"
 msgstr "Skok na místo"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
 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:114
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:113
 msgid "Unable to parse Lon/Lat"
 msgstr "Nelze rozpoznat šířku/délku"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
 msgid "Simplify Way"
 msgstr "Zjednodušit cestu"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
 msgid "Delete unnecessary nodes from a way."
 msgstr "Smazat nepotřebné uzly z cesty."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:82
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83
 msgid "Please select at least one way to simplify."
 msgstr "Vyberte alespoň jednu cestu k zjednodušení."
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:87
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88
 #, java-format
 msgid "The selection contains {0} way. Are you sure you want to simplify it?"
@@ -11302,25 +12255,25 @@
 msgstr[2] "Výběr obsahuje {0} cest. Opravdu je chcete všechny zjednodušit?"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:90
+#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91
 msgid "Are you sure?"
 msgstr "Jste si jist?"
 
-#: ../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:74
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:75
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:92
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:73
 msgid "Validation errors"
 msgstr "Chyby kontroly"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:89
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:90
 msgid "No validation errors"
 msgstr "Žádné chyby při kontrole"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:164
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:165
 msgid "Grid"
 msgstr "Mřížka"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:280
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:287
 #, java-format
 msgid ""
@@ -11409,53 +12362,53 @@
 msgstr "Provede kontrolu dat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
 msgid "Data with errors. Upload anyway?"
 msgstr "Data mají chyby. Přesto nahrát?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:74
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:72
 msgid "Open the validation window."
 msgstr "Otevřít okno s výsledkem kontroly."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:79
 msgid "Zoom to problem"
 msgstr "Přiblížit na problém"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
 msgid "Fix"
 msgstr "Opravit"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:102
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:100
 msgid "Fix the selected errors."
 msgstr "Opravit vybrané chyby"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
 msgid "Ignore"
 msgstr "Ignorovat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid "Ignore the selected errors next time."
 msgstr "Ignorovat zvolené chyby pro příště."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
 msgid "Whole group"
 msgstr "Celá skupina"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
 msgid "Single elements"
 msgstr "Jednotlivé prvky"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:192
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:188
 msgid "Nothing"
 msgstr "Nic"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:189
 msgid "Ignore whole group or individual elements?"
 msgstr "Ignorovat celou skupinu, nebo jednotlivé prvky?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:194
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:190
 msgid "Ignoring elements"
 msgstr "Ignoruji elementy"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:67
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
 #, java-format
 msgid "Replace \"{0}\" by \"{1}\" for"
@@ -11479,23 +12432,56 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
-msgid ""
-"This test checks if two roads, railways or waterways crosses in the same "
-"layer, but are not connected by a node."
+#, fuzzy
+msgid ""
+"This test checks if two roads, railways, waterways or buildings crosses in "
+"the same layer, but are not connected by a node."
 msgstr ""
 "Tento test kontroluje na přítomnost silnic, železnic a vodních cest, které "
 "se kříží ve stejné vrstvě, ale nejsou spojeny společným uzlem."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:118
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
+#, fuzzy
+msgid "Crossing buildings"
+msgstr "Vytvořit budovy"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
 msgid "Crossing ways"
 msgstr "Zkřížené cesty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:41
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:59
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:72
 msgid "Duplicated nodes"
 msgstr "Duplicitní uzly"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:43
 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/DuplicateNode.java:69
+#, fuzzy
+msgid "Nodes at same position"
+msgstr "Uzly se stejným jménem"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146
+msgid "Confirmation"
+msgstr "Potvrzení"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:58
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
+#, fuzzy
+msgid "Duplicated ways"
+msgstr "Zduplikovat cestu"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
+#, fuzzy
+msgid ""
+"This test checks that there are no ways with same tags and same node "
+"coordinates."
+msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
+#, fuzzy
+msgid "Delete duplicate ways"
+msgstr "Vytvořit duplikát cesty"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -11582,23 +12568,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:150
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:149
 msgid "Properties checker :"
 msgstr "Kontrola vlastností :"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:151
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:150
 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:282
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:281
 #, java-format
 msgid "Invalid tagchecker line - {0}: {1}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:295
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:294
 #, java-format
 msgid "Invalid spellcheck line: {0}"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:306
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:305
 #, java-format
 msgid ""
@@ -11609,7 +12595,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:427
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
 msgid "Illegal tag/value combinations"
 msgstr "Neplatná kombinace klíče/hodnoty"
@@ -11617,80 +12603,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:448
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:447
 msgid "Painting problem"
 msgstr "Problém s vykreslováním"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:456
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Klíč ''{0}'' je neplatný."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:462
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
 msgid "Tags with empty values"
 msgstr "Klíče s prázdnými hodnotami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:468
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 msgid "Invalid property key"
 msgstr "Neplatné klíče vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:474
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:473
 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:480
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:479
 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:486
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:485
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:512
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Klíč ''{0}'' není v předvolbách."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:514
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:513
 msgid "Presets do not contain property key"
 msgstr "Předvolby neobsahují vlastnost klíč"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:535
 #, 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:537
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:536
 msgid "Presets do not contain property value"
 msgstr "Předvolby neobsahují vlastnost hodnota"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:548
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "FIXMES"
 msgstr "OPRAVY"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:593
 msgid "Check property keys."
 msgstr "Kontrola klíčů vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:595
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:594
 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:602
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:601
 msgid "Use complex property checker."
 msgstr "Použít komplexní kontrolu vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:602
 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:623
 #: ../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:646
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:662
 #: ../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 "zdroj TagCheckeru"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -11698,82 +12684,82 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
 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:689
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:688
 msgid "Edit the selected source."
 msgstr "Upravit zvolený zdroj."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:692
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:691
 msgid "Data sources"
 msgstr "Zdroje dat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:711
 msgid "Check property values."
 msgstr "Kontrola hodnot vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:713
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:712
 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:720
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:719
 msgid "Check for FIXMES."
 msgstr "Zkontrolovat tagy s FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:720
 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:727
+msgid "Check for paint notes."
+msgstr ""
+
 #: ../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:729
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
 msgid "Use default data file."
 msgstr "Použít stadardní datový soubor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
 msgid "Use the default data file (recommended)."
 msgstr "Použít standardní datový soubor (doporučeno)."
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:739
+msgid "Use default tag ignore file."
+msgstr ""
+
 #: ../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:741
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:743
+msgid "Use default spellcheck file."
+msgstr ""
+
 #: ../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:745
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:839
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:838
 msgid "Fix properties"
 msgstr "Opravit vlastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:960
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:959
 msgid "Could not find element type"
 msgstr "Nelze najít typ elementu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:977
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:976
 msgid "Could not find warning level"
 msgstr "Nelze najít úroveň varování"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:985
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Neplatný výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -11920,7 +12906,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:4192 build/trans_style.java:4199
-#: build/trans_style.java:4206 build/trans_style.java:4213
-#: build/trans_style.java:4220
+#: build/trans_style.java:4151 build/trans_style.java:4158
+#: build/trans_style.java:4165 build/trans_style.java:4172
+#: build/trans_style.java:4179
 msgid "building"
 msgstr "budova"
@@ -11934,5 +12920,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4227
+#: build/trans_style.java:4186
 msgid "area"
 msgstr "oblast"
@@ -12068,5 +13054,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:57
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:56
 msgid "Exception occurred"
 msgstr "Nastala výjimka"
@@ -12133,14 +13119,14 @@
 msgstr "Nápověda pluginu WMS Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:66
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
 msgid "Rectified Image..."
 msgstr "Zaměřený obrázek..."
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
 msgid "Download Rectified Images From Various Services"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
 #, java-format
 msgid "WMS: {0}"
@@ -12151,26 +13137,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:107
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
 msgid "Custom WMS Link"
 msgstr "Vlastní WMS Link"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
 msgid "Supported Rectifier Services:"
 msgstr "Podporované zdroje k překreslování:"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
 msgid "Visit Homepage"
 msgstr "Navštívit domovskou stránku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
 msgid "WMS URL or Image ID:"
 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
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
 msgid "Add Rectified Image"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
 msgid ""
 "Couldn't match the entered link or id to the selected service. Please try "
@@ -12178,37 +13164,55 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:200
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
 msgid "No valid WMS URL or id"
 msgstr "Neplatná URL WMS nebo id"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
 msgid "Adjust WMS"
 msgstr "Upravit WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:43
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust the position of the selected WMS layer"
 msgstr "Upravit pozici zvolené WMS vrstvy"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:173
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
 msgid "Please select the WMS layer to adjust."
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Select WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:176
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:175
 msgid "Start adjusting"
 msgstr ""
 
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:190
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:191
-msgid "There are currently no WMS layer to adjust."
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:192
 msgid "No layers to adjust"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:125
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:111
+#, java-format
+msgid ""
+"Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
+"or a trailing '?'."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
+msgid ""
+"Warning: Fetching WMS tiles is likely to fail. Please check you preference "
+"settings."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
+#, java-format
+msgid "Warning: The complete URL is ''{0}''."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134
 #, java-format
 msgid ""
@@ -12223,15 +13227,43 @@
 msgstr "Automatické stahování"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:114
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:94
+#, java-format
+msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
+#, fuzzy
+msgid "(deactivated)"
+msgstr "Aktivovat"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:135
 #, 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:116
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:137
 #, 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:162
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:180
+#, java-format
+msgid ""
+"<html>The base URL<br>''{0}''<br>for this WML layer does neither end with a "
+"''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS request. "
+"You should check your<br>preference settings.<br>Do you want to fetch WMS "
+"tiles anyway?"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:188
+msgid "Yes, fetch images"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:194
+#, fuzzy
+msgid "Invalid URL?"
+msgstr "Neplatné datum"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:217
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -12239,90 +13271,102 @@
 "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:284
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:234
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:293
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:246
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:305
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:268
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:329
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:288
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:349
 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:353
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:315
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:377
 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:381
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:392
 #, 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:393
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:143
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:153
 msgid "WMS"
 msgstr "WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:156
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:166
 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:40
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
 msgid "WMS Plugin Preferences"
 msgstr "Nastavení pluginu WMS Plugin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:40
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:35
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
 msgstr "Upravit seznam WMS serverů zobrazený v menu WMS pluginu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:70
 msgid "Menu Name"
 msgstr "Jméno v menu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:42
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:37
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:74
 msgid "WMS URL"
 msgstr "WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
 msgid "Menu Name (Default)"
 msgstr "Jméno v menu (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:54
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:49
 msgid "WMS URL (Default)"
 msgstr "WMS URL (výchozí)"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Enter a menu name and WMS URL"
 msgstr "Zadejte jméno v menu a WMS URL"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:106
-msgid "Copy Default"
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:102
+#, fuzzy
+msgid "Copy Selected Default(s)"
 msgstr "Zkopírovat výchozí"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:135
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+#, fuzzy
+msgid "Please select at least one row to copy."
+msgstr "Zvolte minimálně jednu cestu."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:154
 msgid "Downloader:"
 msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
+#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
+#, fuzzy
+msgid "WMS Files (*.wms)"
+msgstr "TCX Soubory (*.tcx)"
 
 #. *
@@ -12718,62 +13762,7 @@
 #: build/trans_presets.java:120 build/trans_presets.java:140
 #: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1545 build/trans_presets.java:3015
+#: build/trans_presets.java:1557 build/trans_presets.java:3143
 msgid "Reference"
 msgstr "Číslo"
-
-#. item "Streets/Motorway" text "Name"
-#. item "Streets/Motorway Link" label "Edit Motorway Link"
-#. <space />
-#. <key key="highway" value="motorway_link" />
-#. <optional>
-#. item "Streets/Trunk" text "Name"
-#. item "Streets/Trunk Link" text "Reference"
-#. <optional>
-#. item "Streets/Primary" text "Name"
-#. item "Streets/Primary Link" label "Edit Primary Link"
-#. <space />
-#. <key key="highway" value="primary_link" />
-#. <optional>
-#. item "Streets/Secondary" text "Name"
-#. item "Streets/Tertiary" text "Name"
-#. item "Streets/Unclassified" check "Embankment"
-#. item "Streets/Residential" check "Embankment"
-#. item "Streets/Living Street" check "Embankment"
-#. item "Streets/Service" check "Embankment"
-#. item "Streets/Road (Unknown Type)" check "Embankment"
-#. item "Streets/Roundabout" check "Embankment"
-#. item "Streets/Bridge" text "Name"
-#. item "Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
-#. item "Ways/Bridleway" check "Embankment"
-#. item "Ways/Cycleway" check "Embankment"
-#. item "Ways/Footway" check "Embankment"
-#. item "Ways/Pedestrian" check "Embankment"
-#. item "Ways/Steps" check "Embankment"
-#. item "Ways/Path" check "Embankment"
-#. item "Water/Drain" text "Name"
-#. item "Water/Stream" text "Name"
-#. item "Water/Canal" text "Name"
-#. item "Water/River" text "Name"
-#. item "Railway/Bus Guideway" check "Embankment"
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:356
-#: build/trans_presets.java:371 build/trans_presets.java:386
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:467
-#: build/trans_presets.java:486 build/trans_presets.java:505
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:659 build/trans_presets.java:1055
-#: build/trans_presets.java:1063 build/trans_presets.java:1071
-#: build/trans_presets.java:1081 build/trans_presets.java:1300
-msgid "Layer"
-msgstr "Vrstva"
 
 #. item "Streets/Motorway" combo "Layer"
@@ -12788,5 +13777,5 @@
 #: build/trans_presets.java:104 build/trans_presets.java:123
 #: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:357
+#: build/trans_presets.java:181 build/trans_presets.java:358
 msgid "Lanes"
 msgstr "Jízdních pruhů"
@@ -12801,5 +13790,4 @@
 #. item "Streets/Tertiary" combo "Layer"
 #. item "Streets/Unclassified" combo "Layer"
-#. item "Streets/Road (Unknown Type)" combo "Layer"
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
@@ -12809,10 +13797,10 @@
 #: build/trans_presets.java:182 build/trans_presets.java:201
 #: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:312 build/trans_presets.java:333
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:411 build/trans_presets.java:430
-#: build/trans_presets.java:450 build/trans_presets.java:469
-#: build/trans_presets.java:507 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:313 build/trans_presets.java:334
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:412 build/trans_presets.java:431
+#: build/trans_presets.java:452 build/trans_presets.java:472
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1307
 msgid "Max. speed (km/h)"
 msgstr "Max. rychlost (km/h)"
@@ -12856,9 +13844,9 @@
 #: build/trans_presets.java:254 build/trans_presets.java:273
 #: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:319 build/trans_presets.java:351
-#: build/trans_presets.java:403 build/trans_presets.java:423
-#: build/trans_presets.java:443 build/trans_presets.java:462
-#: build/trans_presets.java:481 build/trans_presets.java:500
-#: build/trans_presets.java:654 build/trans_presets.java:1295
+#: build/trans_presets.java:320 build/trans_presets.java:352
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:444 build/trans_presets.java:464
+#: build/trans_presets.java:484 build/trans_presets.java:503
+#: build/trans_presets.java:659 build/trans_presets.java:1300
 msgid "Oneway"
 msgstr "Jednosměrka"
@@ -12906,13 +13894,13 @@
 #: build/trans_presets.java:219 build/trans_presets.java:237
 #: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:352
-#: build/trans_presets.java:361 build/trans_presets.java:404
-#: build/trans_presets.java:424 build/trans_presets.java:444
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:501 build/trans_presets.java:520
-#: build/trans_presets.java:541 build/trans_presets.java:562
-#: build/trans_presets.java:583 build/trans_presets.java:604
-#: build/trans_presets.java:625 build/trans_presets.java:655
-#: build/trans_presets.java:1296 build/trans_surveyor.java:12
+#: build/trans_presets.java:307 build/trans_presets.java:353
+#: build/trans_presets.java:362 build/trans_presets.java:405
+#: build/trans_presets.java:425 build/trans_presets.java:445
+#: build/trans_presets.java:465 build/trans_presets.java:485
+#: build/trans_presets.java:504 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:660
+#: build/trans_presets.java:1301 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -12954,13 +13942,13 @@
 #: build/trans_presets.java:220 build/trans_presets.java:238
 #: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:353
-#: build/trans_presets.java:377 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:464 build/trans_presets.java:483
-#: build/trans_presets.java:502 build/trans_presets.java:521
-#: build/trans_presets.java:542 build/trans_presets.java:563
-#: build/trans_presets.java:584 build/trans_presets.java:605
-#: build/trans_presets.java:626 build/trans_presets.java:656
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:378 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1302
 msgid "Tunnel"
 msgstr "Tunel"
@@ -13000,12 +13988,12 @@
 #: build/trans_presets.java:221 build/trans_presets.java:239
 #: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:354
-#: build/trans_presets.java:406 build/trans_presets.java:426
-#: build/trans_presets.java:446 build/trans_presets.java:465
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:522 build/trans_presets.java:543
-#: build/trans_presets.java:564 build/trans_presets.java:585
-#: build/trans_presets.java:606 build/trans_presets.java:627
-#: build/trans_presets.java:657 build/trans_presets.java:1298
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:407 build/trans_presets.java:427
+#: build/trans_presets.java:447 build/trans_presets.java:467
+#: build/trans_presets.java:487 build/trans_presets.java:506
+#: build/trans_presets.java:525 build/trans_presets.java:546
+#: build/trans_presets.java:567 build/trans_presets.java:588
+#: build/trans_presets.java:609 build/trans_presets.java:630
+#: build/trans_presets.java:662 build/trans_presets.java:1303
 msgid "Cutting"
 msgstr "Zářez"
@@ -13045,12 +14033,12 @@
 #: build/trans_presets.java:222 build/trans_presets.java:240
 #: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:466
-#: build/trans_presets.java:485 build/trans_presets.java:504
-#: build/trans_presets.java:523 build/trans_presets.java:544
-#: build/trans_presets.java:565 build/trans_presets.java:586
-#: build/trans_presets.java:607 build/trans_presets.java:628
-#: build/trans_presets.java:658 build/trans_presets.java:1299
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1304
 msgid "Embankment"
 msgstr "Násep"
@@ -13206,17 +14194,17 @@
 #: build/trans_presets.java:225 build/trans_presets.java:243
 #: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:313 build/trans_presets.java:358
-#: build/trans_presets.java:374 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:451 build/trans_presets.java:470
-#: build/trans_presets.java:488 build/trans_presets.java:508
-#: build/trans_presets.java:529 build/trans_presets.java:550
-#: build/trans_presets.java:571 build/trans_presets.java:592
-#: build/trans_presets.java:613 build/trans_presets.java:634
-#: build/trans_presets.java:662 build/trans_presets.java:675
-#: build/trans_presets.java:688 build/trans_presets.java:701
-#: build/trans_presets.java:714 build/trans_presets.java:727
-#: build/trans_presets.java:740 build/trans_presets.java:1303
-#: build/trans_presets.java:1486 build/trans_presets.java:1528
+#: build/trans_presets.java:314 build/trans_presets.java:359
+#: build/trans_presets.java:375 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:491 build/trans_presets.java:511
+#: build/trans_presets.java:532 build/trans_presets.java:553
+#: build/trans_presets.java:574 build/trans_presets.java:595
+#: build/trans_presets.java:616 build/trans_presets.java:637
+#: build/trans_presets.java:667 build/trans_presets.java:680
+#: build/trans_presets.java:693 build/trans_presets.java:706
+#: build/trans_presets.java:719 build/trans_presets.java:732
+#: build/trans_presets.java:745 build/trans_presets.java:1308
+#: build/trans_presets.java:1498 build/trans_presets.java:1540
 msgid "Width (meters)"
 msgstr "Šířka (metrů)"
@@ -13243,4 +14231,5 @@
 #. item "Streets/Service" combo "Layer"
 #. item "Streets/Parking Aisle" check "Oneway"
+#. item "Streets/Road (Unknown Type)" combo "Layer"
 #. item "Ways/Construction" combo "Layer"
 #. item "Ways/Bridleway" combo "Layer"
@@ -13259,11 +14248,12 @@
 #: build/trans_presets.java:242 build/trans_presets.java:260
 #: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:524 build/trans_presets.java:545
-#: build/trans_presets.java:566 build/trans_presets.java:587
-#: build/trans_presets.java:608 build/trans_presets.java:629
-#: build/trans_presets.java:660 build/trans_presets.java:1301
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:611
+#: build/trans_presets.java:632 build/trans_presets.java:665
+#: build/trans_presets.java:1306
 msgid "Surface"
 msgstr "Povrch"
@@ -13273,4 +14263,5 @@
 #. item "Streets/Service" combo "Surface"
 #. item "Streets/Parking Aisle" combo "Surface"
+#. item "Streets/Road (Unknown Type)" combo "Surface"
 #. item "Ways/Construction" combo "Surface"
 #. item "Ways/Bridleway" combo "Surface"
@@ -13285,9 +14276,10 @@
 #: build/trans_presets.java:242 build/trans_presets.java:260
 #: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:524 build/trans_presets.java:545
-#: build/trans_presets.java:660 build/trans_presets.java:1301
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:665
+#: build/trans_presets.java:1306
 msgid "paved"
 msgstr "zpevněný"
@@ -13295,10 +14287,73 @@
 #: build/trans_presets.java:242 build/trans_presets.java:260
 #: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:660 build/trans_presets.java:1301
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:665
+#: build/trans_presets.java:1306
 msgid "unpaved"
 msgstr "nezpevněný"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:665
+#: build/trans_presets.java:1306
+#, fuzzy
+msgid "asphalt"
+msgstr "Horská chata"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:665
+#: build/trans_presets.java:1306
+msgid "concrete"
+msgstr "beton"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:665
+#: build/trans_presets.java:1306
+#, fuzzy
+msgid "metal"
+msgstr "Půjčovna"
+
+#. color heath
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wood"/>
+#. <icon src="misc/landmark/trees.png"/>
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:665
+#: build/trans_presets.java:1306 build/trans_style.java:3367
+msgid "wood"
+msgstr "Prales"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:665
+#: build/trans_presets.java:1306
+#, fuzzy
+msgid "paving_stones"
+msgstr "parkovací lístky"
 
 #. item "Ways/Track Grade 2" combo "Surface"
@@ -13306,12 +14361,94 @@
 #: build/trans_presets.java:242 build/trans_presets.java:260
 #: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:449 build/trans_presets.java:468
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:524 build/trans_presets.java:545
-#: build/trans_presets.java:566 build/trans_presets.java:587
-#: build/trans_presets.java:660 build/trans_presets.java:1301
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:527
+#: build/trans_presets.java:548 build/trans_presets.java:569
+#: build/trans_presets.java:590 build/trans_presets.java:665
+#: build/trans_presets.java:1306
 msgid "cobblestone"
 msgstr "dlažební kostky"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:527
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:665 build/trans_presets.java:1306
+msgid "gravel"
+msgstr "štěrk"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:665
+#: build/trans_presets.java:1306
+#, fuzzy
+msgid "pebblestone"
+msgstr "dlažební kostky"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:665
+#: build/trans_presets.java:1306
+#, fuzzy
+msgid "compacted"
+msgstr "nekompletní"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:665
+#: build/trans_presets.java:1306
+#, fuzzy
+msgid "grass_paver"
+msgstr "tráva"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:527
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:665 build/trans_presets.java:1306
+msgid "grass"
+msgstr "tráva"
+
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:527
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:665 build/trans_presets.java:1306
+msgid "sand"
+msgstr "písek"
+
+#. item "Ways/Track Grade 4" combo "Surface"
+#. item "Ways/Track Grade 5" combo "Surface"
+#: build/trans_presets.java:242 build/trans_presets.java:260
+#: build/trans_presets.java:279 build/trans_presets.java:294
+#: build/trans_presets.java:312 build/trans_presets.java:410
+#: build/trans_presets.java:430 build/trans_presets.java:451
+#: build/trans_presets.java:471 build/trans_presets.java:490
+#: build/trans_presets.java:509 build/trans_presets.java:527
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:665 build/trans_presets.java:1306
+msgid "ground"
+msgstr "země"
 
 #. item "Streets/Residential" text "Width (meters)"
@@ -13392,20 +14529,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:317
+#: build/trans_presets.java:318
 msgid "Road Restrictions"
 msgstr "Silniční omezení"
 
 #. item
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Edit Road Restrictions"
 msgstr "Upravit silniční omezení"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:320
+#: build/trans_presets.java:321
 msgid "Toll"
 msgstr "Poplatek"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá ulice"
@@ -13418,8 +14555,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:322 build/trans_presets.java:526
-#: build/trans_presets.java:547 build/trans_presets.java:568
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:631
+#: build/trans_presets.java:323 build/trans_presets.java:529
+#: build/trans_presets.java:550 build/trans_presets.java:571
+#: build/trans_presets.java:592 build/trans_presets.java:613
+#: build/trans_presets.java:634
 msgid "Access"
 msgstr "Přístup"
@@ -13454,32 +14591,47 @@
 #. item "Ways/Track Grade 5" combo "Motorcycle"
 #. item "Ways/Track Grade 5" combo "Motorcar"
+#. item "Ways/Path" combo "Foot"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Snowmobile"
 #. item "Ways/Path" combo "Motorcar"
-#. item "Ways/Path" combo "Snowmobile"
-#. item "Ways/Path" combo "Horse"
-#. item "Ways/Path" combo "Bicycle"
-#. item "Ways/Path" combo "Ski"
-#. item "Ways/Path" combo "Foot"
+#. item "Car/Parking" combo "Park and Ride"
+#. item "Car/Parking" combo "Fee"
 #. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Car/Parking" combo "Spaces for Women"
+#. item "Car/Parking" combo "Spaces for Parents"
+#. item "Tourism/Information Terminal" combo "Fee"
+#. item "Tourism/Audioguide" combo "Fee"
 #. item "Amenities/Toilets" combo "Fee"
+#. item "Amenities/Hunting Stand" combo "Shelter"
+#. item "Amenities/Hunting Stand" combo "Hide"
+#. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: 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:331
-#: build/trans_presets.java:332 build/trans_presets.java:526
-#: build/trans_presets.java:527 build/trans_presets.java:528
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:570
-#: build/trans_presets.java:589 build/trans_presets.java:590
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:611 build/trans_presets.java:612
-#: build/trans_presets.java:631 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_presets.java:646
-#: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:650
-#: build/trans_presets.java:651 build/trans_presets.java:1387
-#: build/trans_presets.java:2328 build/trans_presets.java:2592
+#: 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:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:449
+#: build/trans_presets.java:469 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_presets.java:649
+#: build/trans_presets.java:650 build/trans_presets.java:651
+#: build/trans_presets.java:652 build/trans_presets.java:653
+#: build/trans_presets.java:654 build/trans_presets.java:1393
+#: build/trans_presets.java:1394 build/trans_presets.java:1397
+#: build/trans_presets.java:1398 build/trans_presets.java:1399
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:2397 build/trans_presets.java:2439
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2711
 msgid "yes"
 msgstr "ano"
@@ -13492,40 +14644,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: 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:331
-#: build/trans_presets.java:332 build/trans_presets.java:526
-#: build/trans_presets.java:527 build/trans_presets.java:528
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:570
-#: build/trans_presets.java:589 build/trans_presets.java:590
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:611 build/trans_presets.java:612
-#: build/trans_presets.java:631 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_style.java:212
+#: 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:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_style.java:212
 msgid "private"
 msgstr "soukromý"
 
-#: 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:331
-#: build/trans_presets.java:332 build/trans_presets.java:526
-#: build/trans_presets.java:527 build/trans_presets.java:528
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:570
-#: build/trans_presets.java:589 build/trans_presets.java:590
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:611 build/trans_presets.java:612
-#: build/trans_presets.java:631 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_presets.java:646
-#: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:650
-#: build/trans_presets.java:651
+#: 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:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_presets.java:649
+#: build/trans_presets.java:650 build/trans_presets.java:651
+#: build/trans_presets.java:652 build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "designated"
 msgstr "vyhrazený(preferovaný)"
@@ -13538,19 +14690,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: 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:331
-#: build/trans_presets.java:332 build/trans_presets.java:526
-#: build/trans_presets.java:527 build/trans_presets.java:528
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:570
-#: build/trans_presets.java:589 build/trans_presets.java:590
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:611 build/trans_presets.java:612
-#: build/trans_presets.java:631 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_style.java:219
+#: 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:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_style.java:219
 msgid "destination"
 msgstr "dopravní obsluha"
@@ -13573,65 +14725,70 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: 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:331
-#: build/trans_presets.java:332 build/trans_presets.java:526
-#: build/trans_presets.java:527 build/trans_presets.java:528
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:570
-#: build/trans_presets.java:589 build/trans_presets.java:590
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:611 build/trans_presets.java:612
-#: build/trans_presets.java:631 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_style.java:205
+#: 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:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_style.java:205
 msgid "permissive"
 msgstr "na povolení"
 
-#: build/trans_presets.java:322 build/trans_presets.java:326
-#: build/trans_presets.java:329 build/trans_presets.java:526
-#: build/trans_presets.java:527 build/trans_presets.java:528
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:570
-#: build/trans_presets.java:589 build/trans_presets.java:590
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:611 build/trans_presets.java:612
-#: build/trans_presets.java:631 build/trans_presets.java:632
-#: build/trans_presets.java:633
+#: build/trans_presets.java:323 build/trans_presets.java:327
+#: build/trans_presets.java:330 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636
 msgid "agricultural"
 msgstr "zemědelská vozidla"
 
-#: 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:331
-#: build/trans_presets.java:332 build/trans_presets.java:526
-#: build/trans_presets.java:527 build/trans_presets.java:528
-#: build/trans_presets.java:547 build/trans_presets.java:548
-#: build/trans_presets.java:549 build/trans_presets.java:568
-#: build/trans_presets.java:569 build/trans_presets.java:570
-#: build/trans_presets.java:589 build/trans_presets.java:590
-#: build/trans_presets.java:591 build/trans_presets.java:610
-#: build/trans_presets.java:611 build/trans_presets.java:612
-#: build/trans_presets.java:631 build/trans_presets.java:632
-#: build/trans_presets.java:633 build/trans_presets.java:646
-#: build/trans_presets.java:647 build/trans_presets.java:648
-#: build/trans_presets.java:649 build/trans_presets.java:650
-#: build/trans_presets.java:651 build/trans_presets.java:768
-#: build/trans_presets.java:783 build/trans_presets.java:1325
-#: build/trans_presets.java:1387 build/trans_presets.java:2328
-#: build/trans_presets.java:2592
+#: 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:331 build/trans_presets.java:332
+#: build/trans_presets.java:333 build/trans_presets.java:449
+#: build/trans_presets.java:469 build/trans_presets.java:529
+#: build/trans_presets.java:530 build/trans_presets.java:531
+#: build/trans_presets.java:550 build/trans_presets.java:551
+#: build/trans_presets.java:552 build/trans_presets.java:571
+#: build/trans_presets.java:572 build/trans_presets.java:573
+#: build/trans_presets.java:592 build/trans_presets.java:593
+#: build/trans_presets.java:594 build/trans_presets.java:613
+#: build/trans_presets.java:614 build/trans_presets.java:615
+#: build/trans_presets.java:634 build/trans_presets.java:635
+#: build/trans_presets.java:636 build/trans_presets.java:649
+#: build/trans_presets.java:650 build/trans_presets.java:651
+#: build/trans_presets.java:652 build/trans_presets.java:653
+#: build/trans_presets.java:654 build/trans_presets.java:773
+#: build/trans_presets.java:788 build/trans_presets.java:1330
+#: build/trans_presets.java:1393 build/trans_presets.java:1394
+#: build/trans_presets.java:1397 build/trans_presets.java:1398
+#: build/trans_presets.java:1399 build/trans_presets.java:1763
+#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:2439 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2711
 msgid "no"
 msgstr "ne"
 
-#: build/trans_presets.java:325
+#: build/trans_presets.java:326
 msgid "Goods"
 msgstr "Zásobování"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladní vozidlo"
@@ -13646,10 +14803,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:327 build/trans_presets.java:648
-#: build/trans_presets.java:853 build/trans_presets.java:886
-#: build/trans_presets.java:908 build/trans_presets.java:945
-#: build/trans_presets.java:958 build/trans_presets.java:970
-#: build/trans_presets.java:982 build/trans_presets.java:994
-#: build/trans_presets.java:1034
+#: build/trans_presets.java:328 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:891
+#: build/trans_presets.java:913 build/trans_presets.java:950
+#: build/trans_presets.java:963 build/trans_presets.java:975
+#: build/trans_presets.java:987 build/trans_presets.java:999
+#: build/trans_presets.java:1039
 msgid "Horse"
 msgstr "Kůň"
@@ -13665,17 +14822,16 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:328 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:854
-#: build/trans_presets.java:872 build/trans_presets.java:887
-#: build/trans_presets.java:909 build/trans_presets.java:946
-#: build/trans_presets.java:959 build/trans_presets.java:971
-#: build/trans_presets.java:983 build/trans_presets.java:995
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:329 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635 build/trans_presets.java:859
+#: build/trans_presets.java:877 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Motorcycle"
 msgstr "Motocykl"
 
-#. item "Ways/Path" label "Type"
 #. item "Barriers/Cattle Grid" check "Motorcycle"
 #. item "Barriers/Spikes" check "Motorcycle"
@@ -13687,30 +14843,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:329 build/trans_presets.java:528
-#: build/trans_presets.java:549 build/trans_presets.java:570
-#: build/trans_presets.java:591 build/trans_presets.java:612
-#: build/trans_presets.java:633 build/trans_presets.java:646
-#: build/trans_presets.java:873 build/trans_presets.java:888
-#: build/trans_presets.java:910 build/trans_presets.java:947
-#: build/trans_presets.java:960 build/trans_presets.java:972
-#: build/trans_presets.java:984 build/trans_presets.java:996
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:654
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:330
+#: build/trans_presets.java:331
 msgid "Public Service Vehicles (psv)"
 msgstr "Vozidla MHD"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Motorboat"
 msgstr "Motorová loď"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Boat"
 msgstr "Loď"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:334
+#: build/trans_presets.java:335
 msgid "Min. speed (km/h)"
 msgstr "Min. rychlost (km/h)"
@@ -13718,25 +14874,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:335 build/trans_presets.java:373
+#: build/trans_presets.java:336 build/trans_presets.java:374
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnost (tun)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:336
+#: build/trans_presets.java:337
 msgid "Max. Height (meters)"
 msgstr "Max. výška (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Width (meters)"
 msgstr "Max. šířka (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Length (meters)"
 msgstr "Max. délka (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:340
+#: build/trans_presets.java:341
 msgid "Roundabout"
 msgstr "Kruhový objezd"
@@ -13747,5 +14903,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:345
+#: build/trans_presets.java:346
 msgid "Edit Junction"
 msgstr "Upravit křižovatku"
@@ -13761,5 +14917,5 @@
 #. <key key="highway" value="crossing" />
 #. item "Water/Wetland" text "Name"
-#. item "Car/Parking" text "Capacity"
+#. item "Car/Parking" text "Reference number"
 #. item "Man Made/Power Generator" label "Edit Power Generator"
 #. <key key="power" value="generator" />
@@ -13767,9 +14923,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:348 build/trans_presets.java:645
-#: build/trans_presets.java:783 build/trans_presets.java:1130
-#: build/trans_presets.java:1386 build/trans_presets.java:2284
-#: build/trans_presets.java:2770 build/trans_presets.java:2780
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:349 build/trans_presets.java:648
+#: build/trans_presets.java:788 build/trans_presets.java:1135
+#: build/trans_presets.java:1392 build/trans_presets.java:2353
+#: build/trans_presets.java:2898 build/trans_presets.java:2908
+#: build/trans_presets.java:2917
 msgid "Type"
 msgstr "Typ"
@@ -13789,10 +14945,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:348 build/trans_style.java:547
+#: build/trans_presets.java:349 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "dálnice"
 
-#: build/trans_presets.java:348
+#: build/trans_presets.java:349
 msgid "motorway_link"
 msgstr "Dálnice - nájezd"
@@ -13814,10 +14970,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:348 build/trans_style.java:563
+#: build/trans_presets.java:349 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "4. pruhová silnice"
 
-#: build/trans_presets.java:348
+#: build/trans_presets.java:349
 msgid "trunk_link"
 msgstr "4. pruhová silnice - nájezd"
@@ -13839,10 +14995,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:348 build/trans_style.java:579
+#: build/trans_presets.java:349 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "silnice první třídy"
 
-#: build/trans_presets.java:348
+#: build/trans_presets.java:349
 msgid "primary_link"
 msgstr "Silnice 1. třídy - nájezd"
@@ -13864,5 +15020,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:348 build/trans_style.java:595
+#: build/trans_presets.java:349 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -13877,9 +15033,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:348 build/trans_style.java:611
+#: build/trans_presets.java:349 build/trans_style.java:611
 msgid "tertiary"
 msgstr "silnice třetí třídy"
 
-#: build/trans_presets.java:348
+#: build/trans_presets.java:349
 msgid "unclassified"
 msgstr "silnice bez klasifikace"
@@ -13893,9 +15049,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:348 build/trans_style.java:3192
+#: build/trans_presets.java:349 build/trans_style.java:3143
 msgid "residential"
 msgstr "obytná oblast"
 
-#: build/trans_presets.java:348
+#: build/trans_presets.java:349
 msgid "living_street"
 msgstr "obytná zóna"
@@ -13925,10 +15081,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:348 build/trans_style.java:667
-#: build/trans_style.java:4285
+#: build/trans_presets.java:349 build/trans_style.java:667
+#: build/trans_style.java:4244
 msgid "service"
 msgstr "obslužná cesta"
 
-#: build/trans_presets.java:348
+#: build/trans_presets.java:349
 msgid "bus_guideway"
 msgstr "Autobusová dráha"
@@ -13958,6 +15114,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:348 build/trans_style.java:877
-#: build/trans_style.java:3257 build/trans_style.java:3258
+#: build/trans_presets.java:349 build/trans_style.java:877
+#: build/trans_style.java:3208 build/trans_style.java:3209
 msgid "construction"
 msgstr "konstrukce"
@@ -13968,10 +15124,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:366
+#: build/trans_presets.java:367
 msgid "Edit Bridge"
 msgstr "Edituj most"
 
 #. item
-#: build/trans_presets.java:378
+#: build/trans_presets.java:379
 msgid "Edit Tunnel"
 msgstr "Upravit tunel"
@@ -13979,19 +15135,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:392
+#: build/trans_presets.java:393
 msgid "Ways"
 msgstr "Cesty"
 
 #. group "Ways"
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Construction"
 msgstr "Výstavba, plánovaná výstavba (Construction)"
 
 #. item
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Edit Highway Under Construction"
 msgstr "Upravit silnici ve stavbě"
 
-#: build/trans_presets.java:410
+#: build/trans_presets.java:411
 msgid "Junction"
 msgstr "Križovatka"
@@ -14007,5 +15163,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:410 build/trans_style.java:895
+#: build/trans_presets.java:411 build/trans_style.java:895
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -14014,5 +15170,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:416
+#: build/trans_presets.java:417
 msgid "Bridleway"
 msgstr "Cesta pro koně"
@@ -14020,5 +15176,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:418
+#: build/trans_presets.java:419
 msgid "Edit Bridleway"
 msgstr "Upravit cestu pro koně"
@@ -14026,5 +15182,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:434
+#: build/trans_presets.java:435
 msgid "Cycleway"
 msgstr "Cyklostezka"
@@ -14034,11 +15190,17 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:438
+#: build/trans_presets.java:439
 msgid "Edit Cycleway"
 msgstr "Upravit cyklostezku"
 
+#. item "Ways/Cycleway" check "Embankment"
+#: build/trans_presets.java:449
+#, fuzzy
+msgid "Pedestrians"
+msgstr "Pěší zóna"
+
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:454
+#: build/trans_presets.java:456
 msgid "Footway"
 msgstr "Chodník, stezka"
@@ -14047,11 +15209,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:457
+#: build/trans_presets.java:459
 msgid "Edit Footway"
 msgstr "Upravit chodník nebo stezku"
 
+#. item "Ways/Footway" check "Embankment"
+#: build/trans_presets.java:469
+#, fuzzy
+msgid "Bikes"
+msgstr "Jednosměrné hroty"
+
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:473
+#: build/trans_presets.java:476
 msgid "Pedestrian"
 msgstr "Pěší zóna"
@@ -14060,5 +15228,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:476
+#: build/trans_presets.java:479
 msgid "Edit Pedestrian Street"
 msgstr "Upravit pěší zónu"
@@ -14066,5 +15234,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:491
+#: build/trans_presets.java:494
 msgid "Steps"
 msgstr "Schody"
@@ -14074,5 +15242,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:495
+#: build/trans_presets.java:498
 msgid "Edit Flight of Steps"
 msgstr "Upravit schody"
@@ -14081,5 +15249,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:512
+#: build/trans_presets.java:515
 msgid "Track"
 msgstr "Vozová cesta (track)"
@@ -14088,39 +15256,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:515
+#: build/trans_presets.java:518
 msgid "Edit Track"
 msgstr "Upravit vozovou cestu"
 
-#: build/trans_presets.java:524 build/trans_presets.java:545
-msgid "concrete"
-msgstr "beton"
-
-#: build/trans_presets.java:524 build/trans_presets.java:566
-#: build/trans_presets.java:587
-msgid "gravel"
-msgstr "štěrk"
-
-#. item "Ways/Track Grade 4" combo "Surface"
-#. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:524 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
-msgid "ground"
-msgstr "země"
-
-#: build/trans_presets.java:524 build/trans_presets.java:608
-#: build/trans_presets.java:629
-msgid "grass"
-msgstr "tráva"
-
-#: build/trans_presets.java:524 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629
-msgid "sand"
-msgstr "písek"
-
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:532
+#: build/trans_presets.java:535
 msgid "Track Grade 1"
 msgstr "Vozová cesta stupně 1 (zpevněná)"
@@ -14129,5 +15269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:535
+#: build/trans_presets.java:538
 msgid "Edit Track of grade 1"
 msgstr "Upravit vozovou cestu stupně 1 (zpevněnou)"
@@ -14135,5 +15275,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:553
+#: build/trans_presets.java:556
 msgid "Track Grade 2"
 msgstr "Vozová cesta stupně 2"
@@ -14142,5 +15282,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:556
+#: build/trans_presets.java:559
 msgid "Edit Track of grade 2"
 msgstr "Upravit vozovou cestu stupně 2"
@@ -14148,5 +15288,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:574
+#: build/trans_presets.java:577
 msgid "Track Grade 3"
 msgstr "Vozová cesta stupně 3"
@@ -14155,5 +15295,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:577
+#: build/trans_presets.java:580
 msgid "Edit Track of grade 3"
 msgstr "Upravit vozovou cestu stupně 3"
@@ -14161,5 +15301,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:595
+#: build/trans_presets.java:598
 msgid "Track Grade 4"
 msgstr "Vozová cesta stupně 4"
@@ -14168,5 +15308,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:598
+#: build/trans_presets.java:601
 msgid "Edit Track of grade 4"
 msgstr "Upravit vozovou cestu stupně 4"
@@ -14174,5 +15314,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:616
+#: build/trans_presets.java:619
 msgid "Track Grade 5"
 msgstr "Vozová cesta stupně 5 (nejhorší)"
@@ -14181,5 +15321,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:619
+#: build/trans_presets.java:622
 msgid "Edit Track of grade 5"
 msgstr "Upravit vozovou cestu stupně 5 (nejhorší)"
@@ -14188,5 +15328,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:638
+#: build/trans_presets.java:641
 msgid "Path"
 msgstr "Cesta vychozená v terénu pro cyklo/pěší (path)"
@@ -14195,19 +15335,22 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:641
+#: build/trans_presets.java:644
 msgid "Edit Path"
 msgstr "Upravit cestu"
 
-#: build/trans_presets.java:647
+#: build/trans_presets.java:652
+msgid "Ski"
+msgstr "Lyže"
+
+#: build/trans_presets.java:653
 msgid "Snowmobile"
 msgstr "Sněžný skůtr"
 
-#: build/trans_presets.java:650
-msgid "Ski"
-msgstr "Lyže"
-
 #. item "Ways/Path" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:665
+#. item "Tourism/Map" label "Routes shown for:"
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:670 build/trans_presets.java:1725
+#: build/trans_presets.java:1748
 msgid "Hiking"
 msgstr "turistická stezka"
@@ -14217,5 +15360,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:669
+#: build/trans_presets.java:674
 msgid "Edit Hiking"
 msgstr "Editovat turistickou stezka"
@@ -14223,5 +15366,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:678
+#: build/trans_presets.java:683
 msgid "Mountain Hiking"
 msgstr "horská turistická stezka"
@@ -14231,5 +15374,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:682
+#: build/trans_presets.java:687
 msgid "Edit Mountain Hiking"
 msgstr "Editovat horskou stezka"
@@ -14237,5 +15380,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:691
+#: build/trans_presets.java:696
 msgid "Demanding Mountain Hiking"
 msgstr "Náročná horská stezka"
@@ -14245,5 +15388,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:700
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Editovat náročnou horskou stezku"
@@ -14251,5 +15394,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:704
+#: build/trans_presets.java:709
 msgid "Alpine Hiking"
 msgstr "Vysokohorská stezka"
@@ -14259,5 +15402,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:713
 msgid "Edit Alpine Hiking"
 msgstr "Editovat vysokohorskou stezku"
@@ -14265,5 +15408,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:717
+#: build/trans_presets.java:722
 msgid "Demanding Alpine Hiking"
 msgstr "Náročná vysokohorská stezka"
@@ -14273,5 +15416,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:721
+#: build/trans_presets.java:726
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Editovat náročnou vysokohorskou stezku"
@@ -14279,5 +15422,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:735
 msgid "Difficult Alpine Hiking"
 msgstr "Obtížná vysokohorská stezka"
@@ -14287,5 +15430,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:734
+#: build/trans_presets.java:739
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Upravit obtížnou vysokohorskou stezku"
@@ -14293,10 +15436,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:744
+#: build/trans_presets.java:749
 msgid "Waypoints"
 msgstr "Silniční body"
 
 #. group "Waypoints"
-#: build/trans_presets.java:745
+#: build/trans_presets.java:750
 msgid "Motorway Junction"
 msgstr "Dálniční sjezd (exit)"
@@ -14304,15 +15447,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:747
+#: build/trans_presets.java:752
 msgid "Edit Motorway Junction"
 msgstr "Upravit křižovatku dálnic"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:751
+#: build/trans_presets.java:756
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:758
 msgid "Services"
 msgstr "Služby motoristům (odpočívadla)"
@@ -14320,5 +15463,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:755
+#: build/trans_presets.java:760
 msgid "Edit Service Station"
 msgstr "Upravit služby motoristům (odpočívadla)"
@@ -14332,4 +15475,6 @@
 #. item "Car/Rental" text "Name"
 #. item "Car/Sharing" text "Name"
+#. item "Tourism/Information Terminal" text "Closer description"
+#. item "Tourism/Audioguide" text "Closer description"
 #. item "Man Made/Power Station" label "Edit Power Station"
 #. <key key="power" value="station" />
@@ -14349,18 +15494,20 @@
 #. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
 #. <key key="amenity" value="baby_hatch" />
+#. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
 #. <key key="amenity" value="atm" />
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:760 build/trans_presets.java:897
-#: build/trans_presets.java:1377 build/trans_presets.java:1394
-#: build/trans_presets.java:1401 build/trans_presets.java:1407
-#: build/trans_presets.java:1415 build/trans_presets.java:1422
-#: build/trans_presets.java:2292 build/trans_presets.java:2299
-#: build/trans_presets.java:2315 build/trans_presets.java:2326
-#: build/trans_presets.java:2334 build/trans_presets.java:2341
-#: build/trans_presets.java:2391 build/trans_presets.java:2418
-#: build/trans_presets.java:2573 build/trans_presets.java:2609
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:765 build/trans_presets.java:902
+#: build/trans_presets.java:1382 build/trans_presets.java:1406
+#: build/trans_presets.java:1413 build/trans_presets.java:1419
+#: build/trans_presets.java:1427 build/trans_presets.java:1434
+#: build/trans_presets.java:1761 build/trans_presets.java:1771
+#: build/trans_presets.java:2361 build/trans_presets.java:2368
+#: build/trans_presets.java:2384 build/trans_presets.java:2395
+#: build/trans_presets.java:2403 build/trans_presets.java:2410
+#: build/trans_presets.java:2461 build/trans_presets.java:2509
+#: build/trans_presets.java:2675 build/trans_presets.java:2690
+#: build/trans_presets.java:2729 build/trans_presets.java:3148
 msgid "Operator"
 msgstr "Operátor"
@@ -14369,5 +15516,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:764
+#: build/trans_presets.java:769
 msgid "Traffic Signal"
 msgstr "Semafory"
@@ -14377,5 +15524,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:768
+#: build/trans_presets.java:773
 msgid "Pedestrian crossing type"
 msgstr "Typ přechodu pro chodce"
@@ -14384,27 +15531,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:768 build/trans_presets.java:783
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:773 build/trans_presets.java:788
+#: build/trans_presets.java:1330
 msgid "uncontrolled"
 msgstr "volný"
 
-#: build/trans_presets.java:768 build/trans_presets.java:783
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:773 build/trans_presets.java:788
+#: build/trans_presets.java:1330
 msgid "traffic_signals"
 msgstr "světelná signalizace"
 
-#: build/trans_presets.java:768 build/trans_presets.java:783
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:773 build/trans_presets.java:788
+#: build/trans_presets.java:1330
 msgid "island"
 msgstr "ostrov"
 
-#: build/trans_presets.java:768 build/trans_presets.java:783
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:773 build/trans_presets.java:788
+#: build/trans_presets.java:1330
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:769 build/trans_presets.java:785
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:774 build/trans_presets.java:790
+#: build/trans_presets.java:1331
 msgid "Cross on horseback"
 msgstr "Přechod na koni"
@@ -14412,6 +15559,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:770 build/trans_presets.java:784
-#: build/trans_presets.java:1327
+#: build/trans_presets.java:775 build/trans_presets.java:789
+#: build/trans_presets.java:1332
 msgid "Cross by bicycle"
 msgstr "Přechod na kole"
@@ -14420,11 +15567,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:771 build/trans_presets.java:786
-#: build/trans_presets.java:1328
+#: build/trans_presets.java:776 build/trans_presets.java:791
+#: build/trans_presets.java:1333
 msgid "Crossing attendant"
 msgstr "Dohled nad přechodem"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:772
+#: build/trans_presets.java:777
 msgid "Crossing type name (UK)"
 msgstr "Typ přechodu (UK)"
@@ -14432,30 +15579,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:772 build/trans_presets.java:787
+#: build/trans_presets.java:777 build/trans_presets.java:792
 msgid "zebra"
 msgstr "zebra (bez semaforů)"
 
-#: build/trans_presets.java:772 build/trans_presets.java:787
+#: build/trans_presets.java:777 build/trans_presets.java:792
 msgid "pelican"
 msgstr "pelikán (se semafory)"
 
-#: build/trans_presets.java:772 build/trans_presets.java:787
+#: build/trans_presets.java:777 build/trans_presets.java:792
 msgid "toucan"
 msgstr "tukan (se semafory a tlačítkem pro chodce a cyklisty)"
 
-#: build/trans_presets.java:772 build/trans_presets.java:787
+#: build/trans_presets.java:777 build/trans_presets.java:792
 msgid "puffin"
 msgstr "papuchalk"
 
-#: build/trans_presets.java:772 build/trans_presets.java:787
+#: build/trans_presets.java:777 build/trans_presets.java:792
 msgid "pegasus"
 msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)"
 
-#: build/trans_presets.java:772 build/trans_presets.java:787
+#: build/trans_presets.java:777 build/trans_presets.java:792
 msgid "tiger"
 msgstr "tygr"
 
 #. </optional>
-#: build/trans_presets.java:775
+#: build/trans_presets.java:780
 msgid "Stop"
 msgstr "Stop"
@@ -14463,5 +15610,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:783
 msgid "Pedestrian Crossing"
 msgstr "Přechod pro chodce"
@@ -14470,14 +15617,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:781
+#: build/trans_presets.java:786
 msgid "Edit Crossing"
 msgstr "Upravit přechod"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:787
+#: build/trans_presets.java:792
 msgid "Type name (UK)"
 msgstr "Jméno typu (UK)"
 
-#: build/trans_presets.java:789
+#: build/trans_presets.java:794
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objezd"
@@ -14488,14 +15635,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:794
+#: build/trans_presets.java:799
 msgid "Direction"
 msgstr "Směr"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:794
+#: build/trans_presets.java:799
 msgid "clockwise"
 msgstr "po směru hodinových ručiček"
 
-#: build/trans_presets.java:796
+#: build/trans_presets.java:801
 msgid "Turning Circle"
 msgstr "Obratiště"
@@ -14505,20 +15652,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:806
 msgid "City Limit"
 msgstr "Hranice města/obce"
 
 #. item
-#: build/trans_presets.java:802
+#: build/trans_presets.java:807
 msgid "Edit City Limit Sign"
 msgstr "Upravit značku hranice města/obce"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:807
+#: build/trans_presets.java:812
 msgid "Second Name"
 msgstr "Druhé jméno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:809
+#: build/trans_presets.java:814
 msgid "Speed Camera"
 msgstr "Rychlostní radar"
@@ -14526,5 +15673,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:812
+#: build/trans_presets.java:817
 msgid "Emergency Phone"
 msgstr "Nouzový telefon"
@@ -14532,5 +15679,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:815
+#: build/trans_presets.java:820
 msgid "Incline"
 msgstr "Stoupání"
@@ -14538,5 +15685,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:818
+#: build/trans_presets.java:823
 msgid "Incline Steep"
 msgstr "Prudké stoupání"
@@ -14545,10 +15692,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:822
+#: build/trans_presets.java:827
 msgid "Ford"
 msgstr "Brod"
 
 #. item
-#: build/trans_presets.java:823
+#: build/trans_presets.java:828
 msgid "Edit Ford"
 msgstr "Upravit brod"
@@ -14556,5 +15703,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:830
+#: build/trans_presets.java:835
 msgid "Mountain Pass"
 msgstr "Horský průsmyk"
@@ -14562,5 +15709,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:832
+#: build/trans_presets.java:837
 msgid "Edit Mountain Pass"
 msgstr "Upravit horský průsmyk"
@@ -14568,11 +15715,11 @@
 #. item "Waypoints/Mountain Pass" text "Name"
 #. item "Accomodation/Alpine Hut" text "Name"
-#. item "Tourism/Guidepost (Hiking)" text "Name"
+#. item "Tourism/Guidepost" text "Name"
 #. item "Places/Peak" text "Name"
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:837 build/trans_presets.java:1588
-#: build/trans_presets.java:1713 build/trans_presets.java:2714
-#: build/trans_presets.java:2721 build/trans_presets.java:2728
+#: build/trans_presets.java:842 build/trans_presets.java:1600
+#: build/trans_presets.java:1745 build/trans_presets.java:2842
+#: build/trans_presets.java:2849 build/trans_presets.java:2856
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -14580,5 +15727,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:841
+#: build/trans_presets.java:846
 msgid "Barriers"
 msgstr "Bariéry"
@@ -14586,5 +15733,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:844
+#: build/trans_presets.java:849
 msgid "Bollard"
 msgstr "Sloupek"
@@ -14592,5 +15739,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:846
+#: build/trans_presets.java:851
 msgid "Edit Bollard"
 msgstr "Upravit sloupek"
@@ -14635,16 +15782,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:849 build/trans_presets.java:868
-#: build/trans_presets.java:882 build/trans_presets.java:904
-#: build/trans_presets.java:941 build/trans_presets.java:954
-#: build/trans_presets.java:966 build/trans_presets.java:978
-#: build/trans_presets.java:990 build/trans_presets.java:1002
-#: build/trans_presets.java:1012 build/trans_presets.java:1021
-#: build/trans_presets.java:1030
+#: build/trans_presets.java:854 build/trans_presets.java:873
+#: build/trans_presets.java:887 build/trans_presets.java:909
+#: build/trans_presets.java:946 build/trans_presets.java:959
+#: build/trans_presets.java:971 build/trans_presets.java:983
+#: build/trans_presets.java:995 build/trans_presets.java:1007
+#: build/trans_presets.java:1017 build/trans_presets.java:1026
+#: build/trans_presets.java:1035
 msgid "Allowed traffic:"
 msgstr "Povolený provoz:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:856
+#: build/trans_presets.java:861
 msgid "Cycle Barrier"
 msgstr "Zábrana proti kolům"
@@ -14653,5 +15800,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:860
+#: build/trans_presets.java:865
 msgid "Block"
 msgstr "Zátarasa"
@@ -14659,5 +15806,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:863
+#: build/trans_presets.java:868
 msgid "Cattle Grid"
 msgstr "Mříž proti dobytku"
@@ -14665,10 +15812,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:870
 msgid "Edit Cattle Grid"
 msgstr "Editovat mříž proti dobytku"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:880
 msgid "Bus Trap"
 msgstr "Zábrana průjezdná pouze autobusem"
@@ -14676,15 +15823,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:878
+#: build/trans_presets.java:883
 msgid "Spikes"
 msgstr "Jednosměrné hroty"
 
 #. item
-#: build/trans_presets.java:879
+#: build/trans_presets.java:884
 msgid "Edit Spikes"
 msgstr "Editovat jednosměrné hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:890
+#: build/trans_presets.java:895
 msgid "Toll Booth"
 msgstr "Mýtná budka"
@@ -14692,5 +15839,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:892
+#: build/trans_presets.java:897
 msgid "Edit Toll Booth"
 msgstr "Upravit mýtnou budku"
@@ -14698,10 +15845,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:900
+#: build/trans_presets.java:905
 msgid "Border Control"
 msgstr "Hraniční kontrola"
 
 #. item
-#: build/trans_presets.java:901
+#: build/trans_presets.java:906
 msgid "Edit Border Control"
 msgstr "Upravit hraniční kontrolu"
@@ -14711,5 +15858,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:915
+#: build/trans_presets.java:920
 msgid "Hedge"
 msgstr "Živý plot"
@@ -14718,5 +15865,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:919
+#: build/trans_presets.java:924
 msgid "Fence"
 msgstr "Plot"
@@ -14725,5 +15872,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:928
 msgid "Wall"
 msgstr "Zeď"
@@ -14731,5 +15878,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:926
+#: build/trans_presets.java:931
 msgid "City Wall"
 msgstr "Městské hradby"
@@ -14738,5 +15885,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:935
 msgid "Retaining Wall"
 msgstr "Opěrná zeď"
@@ -14748,15 +15895,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:937
+#: build/trans_presets.java:942
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item
-#: build/trans_presets.java:938
+#: build/trans_presets.java:943
 msgid "Edit Entrance"
 msgstr "Upravit vstup"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:949
+#: build/trans_presets.java:954
 msgid "Gate"
 msgstr "Brána"
@@ -14764,50 +15911,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:951
+#: build/trans_presets.java:956
 msgid "Edit Gate"
 msgstr "Editovat bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:962
+#: build/trans_presets.java:967
 msgid "Lift Gate"
 msgstr "Závora"
 
 #. item
-#: build/trans_presets.java:963
+#: build/trans_presets.java:968
 msgid "Edit Lift Gate"
 msgstr "Upravit závoru"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:979
 msgid "Hampshire Gate"
 msgstr "Odstranitelný díl plotu"
 
 #. item
-#: build/trans_presets.java:975
+#: build/trans_presets.java:980
 msgid "Edit Hampshire Gate"
 msgstr "Editovat odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:986
+#: build/trans_presets.java:991
 msgid "Bump Gate"
 msgstr "Brána otevíratelná nárazníkem vozidla"
 
 #. item
-#: build/trans_presets.java:987
+#: build/trans_presets.java:992
 msgid "Edit Bump Gate"
 msgstr "Editovat bránu otevíratelnou nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:998
+#: build/trans_presets.java:1003
 msgid "Kissing Gate"
 msgstr "Průchod v ohrazení s ostrou zatáčkou"
 
 #. item
-#: build/trans_presets.java:999
+#: build/trans_presets.java:1004
 msgid "Edit Kissing Gate"
 msgstr "Editovat průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1007
+#: build/trans_presets.java:1012
 msgid "Stile"
 msgstr "Schůdky přes ohrazení"
@@ -14815,25 +15962,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1014
 msgid "Edit Stile"
 msgstr "Editovat schůdky přes ohrazení"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1017
+#: build/trans_presets.java:1022
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1023
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1026
+#: build/trans_presets.java:1031
 msgid "Sally Port"
 msgstr "Průchod se dvěma vraty"
 
 #. item
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1032
 msgid "Edit Sally Port"
 msgstr "Upravit průchod se dvěma vraty"
@@ -14844,10 +15991,10 @@
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1041 build/trans_presets.java:1084
+#: build/trans_presets.java:1046 build/trans_presets.java:1089
 msgid "Water"
 msgstr "Vodní plocha"
 
 #. group "Water"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1047
 msgid "Spring"
 msgstr "Pramen"
@@ -14855,5 +16002,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1044
+#: build/trans_presets.java:1049
 msgid "Edit Spring"
 msgstr "Upravit pramen"
@@ -14861,5 +16008,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1054
 msgid "Drain"
 msgstr "Odvodňovací kanál, meliorace"
@@ -14867,10 +16014,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1051
+#: build/trans_presets.java:1056
 msgid "Edit Drain"
 msgstr "Editovat odvodňovací kanál, meliorace"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1062
 msgid "Stream"
 msgstr "Potok"
@@ -14878,10 +16025,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1064
 msgid "Edit Stream"
 msgstr "Upravit potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1070
 msgid "Canal"
 msgstr "Plavební kanál"
@@ -14889,10 +16036,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1072
 msgid "Edit Canal"
 msgstr "Upravit plavební kanál"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1078
 msgid "River"
 msgstr "Řeka"
@@ -14902,5 +16049,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1077
+#: build/trans_presets.java:1082
 msgid "Edit River"
 msgstr "Upravit řeku"
@@ -14908,15 +16055,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1091
 msgid "Edit Water"
 msgstr "Upravit vodní plochu"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1090
+#: build/trans_presets.java:1095
 msgid "Land"
 msgstr "Země (souš)"
 
 #. item
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1096
 msgid "Edit Land"
 msgstr "Upravit plochu země"
@@ -14924,15 +16071,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1101
 msgid "Basin"
 msgstr "Vodní nádrž"
 
 #. item
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1102
 msgid "Edit Basin Landuse"
 msgstr "Upravit vodní nádrž"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1107
 msgid "Reservoir"
 msgstr "Umělá vodní plocha"
@@ -14940,15 +16087,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1109
 msgid "Edit Reservoir Landuse"
 msgstr "Upravit umělou vodní plochu"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1114
 msgid "Covered Reservoir"
 msgstr "Zakrytá umělá vodní plocha"
 
 #. item
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1115
 msgid "Edit Covered Reservoir"
 msgstr "Upravit zakrytou umělou vodní plochu"
@@ -14956,5 +16103,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1120
 msgid "Riverbank"
 msgstr "Břeh řeky"
@@ -14963,10 +16110,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1118
+#: build/trans_presets.java:1123
 msgid "Edit Riverbank"
 msgstr "Upravit břeh řeky"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1127
 msgid "Wetland"
 msgstr "Mokřina"
@@ -14977,14 +16124,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1132
 msgid "Edit Wetland"
 msgstr "Upravit mokřinu"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1135
 msgid "swamp"
 msgstr "bažina"
 
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1135
 msgid "bog"
 msgstr "močál"
@@ -14998,35 +16145,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1130 build/trans_style.java:3433
+#: build/trans_presets.java:1135 build/trans_style.java:3384
 msgid "marsh"
 msgstr "mokřina"
 
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1135
 msgid "reedbed"
 msgstr "rákosiny"
 
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1135
 msgid "saltmarsh"
 msgstr "slanisko"
 
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1135
 msgid "tidalflat"
 msgstr "přílivová oblast"
 
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1135
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1137
 msgid "Mud"
 msgstr "Bahno"
 
 #. item
-#: build/trans_presets.java:1133
+#: build/trans_presets.java:1138
 msgid "Edit Mud"
 msgstr "Upravit bahno"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1142
 msgid "Beach"
 msgstr "Pláž"
@@ -15034,20 +16181,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1139
+#: build/trans_presets.java:1144
 msgid "Edit Beach"
 msgstr "Upravit pláž"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1143
+#: build/trans_presets.java:1148
 msgid "Bay"
 msgstr "Zátoka"
 
 #. item
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1149
 msgid "Edit Bay"
 msgstr "Upravit zátoku"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1153
 msgid "Cliff"
 msgstr "Útes"
@@ -15055,10 +16202,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1150
+#: build/trans_presets.java:1155
 msgid "Edit Cliff"
 msgstr "Upravit útes"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1159
 msgid "Coastline"
 msgstr "Linie pobřeží"
@@ -15066,5 +16213,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1161
 msgid "Edit Coastline"
 msgstr "Upravit linii pobřeží"
@@ -15072,5 +16219,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1166
 msgid "Ferry Route"
 msgstr "Přívoz"
@@ -15078,5 +16225,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1163
+#: build/trans_presets.java:1168
 msgid "Edit Ferry"
 msgstr "Upravit přívoz"
@@ -15085,5 +16232,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1171
+#: build/trans_presets.java:1176
 msgid "Boatyard"
 msgstr "doky"
@@ -15091,10 +16238,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1173
+#: build/trans_presets.java:1178
 msgid "Edit Boatyard"
 msgstr "Upravit doky"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1183
 msgid "Dock"
 msgstr "Dok"
@@ -15102,5 +16249,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:1185
 msgid "Edit Dock"
 msgstr "Upravit dok"
@@ -15108,5 +16255,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1186
+#: build/trans_presets.java:1191
 msgid "Dam"
 msgstr "Hráz přehrady"
@@ -15114,15 +16261,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1188
+#: build/trans_presets.java:1193
 msgid "Edit Dam"
 msgstr "Upravit přehradu"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1194
+#: build/trans_presets.java:1199
 msgid "Waterway Point"
 msgstr "Vodní objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1195
+#: build/trans_presets.java:1200
 msgid "Lock Gate"
 msgstr "Plavební komora"
@@ -15131,5 +16278,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1204
 msgid "Weir"
 msgstr "Jez"
@@ -15137,20 +16284,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1206
 msgid "Edit Weir"
 msgstr "Upravit jez"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1211
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:1212
 msgid "Edit Waterfall"
 msgstr "Upravit vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1217
 msgid "Turning Point"
 msgstr "Rožšířené místo pro otáčení lodí"
@@ -15159,15 +16306,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1221
 msgid "Marina"
 msgstr "Přístav"
 
 #. item
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1222
 msgid "Edit Marina"
 msgstr "Upravit přístav"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1226
 msgid "Pier"
 msgstr "Molo"
@@ -15175,10 +16322,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1228
 msgid "Edit Pier"
 msgstr "Upravit molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1232
 msgid "Ferry Terminal"
 msgstr "Přístaviště přívozu"
@@ -15186,10 +16333,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1234
 msgid "Edit Ferry Terminal"
 msgstr "Upravit přístaviště přivozu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1238
 msgid "Slipway"
 msgstr "Skluz v loděnici"
@@ -15199,5 +16346,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1242
 msgid "Edit Slipway"
 msgstr "Upravit skluz v loděnici"
@@ -15205,10 +16352,10 @@
 #. item "Waterway Point/Slipway" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1243
+#: build/trans_presets.java:1248
 msgid "Railway"
 msgstr "Železnice"
 
 #. group "Railway"
-#: build/trans_presets.java:1244
+#: build/trans_presets.java:1249
 msgid "Rail"
 msgstr "Železnice"
@@ -15216,5 +16363,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:1251
 msgid "Edit Rail"
 msgstr "Upravit železnici"
@@ -15244,8 +16391,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1249 build/trans_presets.java:1255
-#: build/trans_presets.java:1262 build/trans_presets.java:1268
-#: build/trans_presets.java:1274 build/trans_presets.java:1280
-#: build/trans_presets.java:1286 build/trans_presets.java:1311
+#: build/trans_presets.java:1254 build/trans_presets.java:1260
+#: build/trans_presets.java:1267 build/trans_presets.java:1273
+#: build/trans_presets.java:1279 build/trans_presets.java:1285
+#: build/trans_presets.java:1291 build/trans_presets.java:1316
 msgid "Optional Types"
 msgstr "Volitelné typy"
@@ -15259,35 +16406,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1249 build/trans_presets.java:1255
-#: build/trans_presets.java:1262 build/trans_presets.java:1268
-#: build/trans_presets.java:1274 build/trans_presets.java:1280
-#: build/trans_presets.java:1286 build/trans_presets.java:1311
+#: build/trans_presets.java:1254 build/trans_presets.java:1260
+#: build/trans_presets.java:1267 build/trans_presets.java:1273
+#: build/trans_presets.java:1279 build/trans_presets.java:1285
+#: build/trans_presets.java:1291 build/trans_presets.java:1316
 msgid "yard"
 msgstr "seřazovací kolej"
 
-#: build/trans_presets.java:1249 build/trans_presets.java:1255
-#: build/trans_presets.java:1262 build/trans_presets.java:1268
-#: build/trans_presets.java:1274 build/trans_presets.java:1280
-#: build/trans_presets.java:1286 build/trans_presets.java:1311
+#: build/trans_presets.java:1254 build/trans_presets.java:1260
+#: build/trans_presets.java:1267 build/trans_presets.java:1273
+#: build/trans_presets.java:1279 build/trans_presets.java:1285
+#: build/trans_presets.java:1291 build/trans_presets.java:1316
 msgid "siding"
 msgstr "paralelní pomocná dráha"
 
-#: build/trans_presets.java:1249 build/trans_presets.java:1255
-#: build/trans_presets.java:1262 build/trans_presets.java:1268
-#: build/trans_presets.java:1274 build/trans_presets.java:1280
-#: build/trans_presets.java:1286 build/trans_presets.java:1311
+#: build/trans_presets.java:1254 build/trans_presets.java:1260
+#: build/trans_presets.java:1267 build/trans_presets.java:1273
+#: build/trans_presets.java:1279 build/trans_presets.java:1285
+#: build/trans_presets.java:1291 build/trans_presets.java:1316
 msgid "spur"
 msgstr "vlečka"
 
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1256
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnice"
 
 #. item
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:1257
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upravit úzkorozchodnou železnici"
 
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1262
 msgid "Monorail"
 msgstr "Monorail"
@@ -15295,45 +16442,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1264
 msgid "Edit Monorail"
 msgstr "Upravit monorail"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1269
 msgid "Preserved"
 msgstr "Historická trať"
 
 #. item
-#: build/trans_presets.java:1265
+#: build/trans_presets.java:1270
 msgid "Edit Preserved Railway"
 msgstr "Upravit historickou trať"
 
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1275
 msgid "Light Rail"
 msgstr "Krátká/lehká trať"
 
 #. item
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1276
 msgid "Edit Light Rail"
 msgstr "Upravit krátká/lehká trať"
 
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1281
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1282
 msgid "Edit Subway"
 msgstr "Upravit metro"
 
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1287
 msgid "Tram"
 msgstr "Tramvaj"
 
 #. item
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1288
 msgid "Edit Tram"
 msgstr "Upravit tramvaj"
 
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1293
 msgid "Bus Guideway"
 msgstr "Autobusová dráha"
@@ -15341,5 +16488,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1290
+#: build/trans_presets.java:1295
 msgid "Edit Bus Guideway"
 msgstr "Upravit autobusovou dráhu"
@@ -15348,14 +16495,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:1312
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnice"
 
 #. item
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1313
 msgid "Edit Disused Railway"
 msgstr "Upravit nepoužívanou železnici"
 
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1318
 msgid "Abandoned Rail"
 msgstr "Opuštěná železnice"
@@ -15364,5 +16511,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1317
+#: build/trans_presets.java:1322
 msgid "Level Crossing"
 msgstr "železniční přejezd"
@@ -15371,5 +16518,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1326
 msgid "Crossing"
 msgstr "Železniční přechod pro chodce"
@@ -15379,5 +16526,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1330
 msgid "Crossing type"
 msgstr "Druh křížení"
@@ -15385,5 +16532,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1336
 msgid "Turntable"
 msgstr "Točna"
@@ -15392,10 +16539,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1341
 msgid "Aerialway"
 msgstr "Lanovky"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1342
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -15403,10 +16550,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1339
+#: build/trans_presets.java:1344
 msgid "Edit Chair Lift"
 msgstr "Upravit sedačkovou lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1348
 msgid "Drag Lift"
 msgstr "Lyžařský vlek"
@@ -15414,10 +16561,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1350
 msgid "Edit Drag Lift"
 msgstr "Upravit lyžařský vlek"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1354
 msgid "Cable Car"
 msgstr "Kyvadlová kabinková lanovka"
@@ -15425,10 +16572,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1356
 msgid "Edit Cable Car"
 msgstr "Upravit kyvadlovou kabinkovou lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1360
 msgid "Gondola"
 msgstr "Oběžná kabinková lanovka"
@@ -15436,5 +16583,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1357
+#: build/trans_presets.java:1362
 msgid "Edit Gondola"
 msgstr "Upravit oběžnou kabinkovou lanovku"
@@ -15442,5 +16589,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1361 build/trans_presets.java:1449
+#: build/trans_presets.java:1366 build/trans_presets.java:1461
 msgid "Station"
 msgstr "Stanice"
@@ -15451,10 +16598,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1363 build/trans_presets.java:1452
+#: build/trans_presets.java:1368 build/trans_presets.java:1464
 msgid "Edit Station"
 msgstr "Upravit stanici"
 
 #. group "Car"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1375
 msgid "Fuel"
 msgstr "Čerpací stanice"
@@ -15464,9 +16611,238 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1374
+#: build/trans_presets.java:1379
 msgid "Edit Fuel"
 msgstr "Upravit čerpací stanici"
 
 #. item "Car/Fuel" text "Operator"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Biergarten" text "Name"
+#. item "Food+Drinks/Bar" text "Name"
+#. item "Food+Drinks/Nightclub" text "Name"
+#. item "Tourism/Attraction" text "Name"
+#. item "Tourism/Museum" text "Name"
+#. item "Tourism/Zoo" text "Name"
+#. item "Tourism/Theme Park" text "Name"
+#. item "Tourism/Information Office" text "Name"
+#. item "Historic Places/Ruins" text "Name"
+#. item "Historic Places/Archaeological Site" text "Name"
+#. item "Sport Facilities/Golf Course" text "Name"
+#. item "Sport Facilities/Miniature Golf" text "Name"
+#. item "Buildings/Library" text "Name"
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#. item "Amenities/Baby Hatch" text "Operator"
+#. item "Shops/Supermarket" text "Name"
+#. item "Shops/Chemist" text "Name"
+#. item "Shops/Convenience Store" text "Name"
+#. item "Shops/Kiosk" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
+#. item "Shops/Butcher" text "Name"
+#. item "Shops/Baker" text "Name"
+#. item "Shops/Florist" text "Name"
+#. item "Shops/Organic" text "Name"
+#. item "Shops/Alcohol" text "Name"
+#. item "Shops/Beverages" text "Name"
+#. item "Shops/Computer" text "Name"
+#. item "Shops/Electronics" text "Name"
+#. item "Shops/Hifi" text "Name"
+#. item "Shops/Furniture" text "Name"
+#. item "Shops/Garden Centre" text "Name"
+#. item "Shops/Hardware" text "Name"
+#. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Stationery" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Toys" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Cash/Bank" text "Operator"
+#. item "Cash/Money Exchange" text "Name"
+#. item "Health/Doctors" text "Name"
+#. item "Health/Dentist" text "Name"
+#. item "Health/Pharmacy" text "Name"
+#. item "Health/Veterinary" text "Name"
+#: build/trans_presets.java:1383 build/trans_presets.java:1621
+#: build/trans_presets.java:1629 build/trans_presets.java:1636
+#: build/trans_presets.java:1643 build/trans_presets.java:1649
+#: build/trans_presets.java:1656 build/trans_presets.java:1663
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1699
+#: build/trans_presets.java:1713 build/trans_presets.java:1810
+#: build/trans_presets.java:1818 build/trans_presets.java:1909
+#: build/trans_presets.java:1915 build/trans_presets.java:2226
+#: build/trans_presets.java:2250 build/trans_presets.java:2433
+#: build/trans_presets.java:2462 build/trans_presets.java:2470
+#: build/trans_presets.java:2476 build/trans_presets.java:2483
+#: build/trans_presets.java:2490 build/trans_presets.java:2496
+#: build/trans_presets.java:2502 build/trans_presets.java:2524
+#: build/trans_presets.java:2531 build/trans_presets.java:2538
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2563
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2602
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2653
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2676 build/trans_presets.java:2684
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2713 build/trans_presets.java:2740
+msgid "Opening Hours"
+msgstr "Otevírací doba"
+
+#. item "Car/Fuel" combo "Opening Hours"
+#. item "Food+Drinks/Restaurant" combo "Opening Hours"
+#. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Cafe" combo "Opening Hours"
+#. item "Food+Drinks/Pub" combo "Opening Hours"
+#. item "Food+Drinks/Biergarten" combo "Opening Hours"
+#. item "Food+Drinks/Bar" combo "Opening Hours"
+#. item "Food+Drinks/Nightclub" combo "Opening Hours"
+#. item "Tourism/Museum" combo "Opening Hours"
+#. item "Tourism/Zoo" combo "Opening Hours"
+#. item "Tourism/Theme Park" combo "Opening Hours"
+#. item "Tourism/Information Office" combo "Opening Hours"
+#. item "Historic Places/Ruins" combo "Opening Hours"
+#. item "Historic Places/Archaeological Site" combo "Opening Hours"
+#. item "Sport Facilities/Golf Course" combo "Opening Hours"
+#. item "Sport Facilities/Miniature Golf" combo "Opening Hours"
+#. item "Buildings/Library" combo "Opening Hours"
+#. item "Buildings/Place of Worship" combo "Opening Hours"
+#. item "Amenities/Bench" combo "Opening Hours"
+#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Shops/Chemist" combo "Opening Hours"
+#. item "Shops/Convenience Store" combo "Opening Hours"
+#. item "Shops/Kiosk" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
+#. item "Shops/Butcher" combo "Opening Hours"
+#. item "Shops/Baker" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
+#. item "Shops/Organic" combo "Opening Hours"
+#. item "Shops/Alcohol" combo "Opening Hours"
+#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Computer" combo "Opening Hours"
+#. item "Shops/Electronics" combo "Opening Hours"
+#. item "Shops/Hifi" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Garden Centre" combo "Opening Hours"
+#. item "Shops/Hardware" combo "Opening Hours"
+#. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Stationery" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Toys" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Cash/Bank" combo "Opening Hours"
+#. item "Cash/Money Exchange" combo "Opening Hours"
+#. item "Health/Doctors" combo "Opening Hours"
+#. item "Health/Dentist" combo "Opening Hours"
+#. item "Health/Pharmacy" combo "Opening Hours"
+#. item "Health/Veterinary" combo "Opening Hours"
+#: build/trans_presets.java:1383 build/trans_presets.java:1621
+#: build/trans_presets.java:1629 build/trans_presets.java:1636
+#: build/trans_presets.java:1643 build/trans_presets.java:1649
+#: build/trans_presets.java:1656 build/trans_presets.java:1663
+#: build/trans_presets.java:1678 build/trans_presets.java:1686
+#: build/trans_presets.java:1699 build/trans_presets.java:1713
+#: build/trans_presets.java:1810 build/trans_presets.java:1818
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:2226 build/trans_presets.java:2250
+#: build/trans_presets.java:2433 build/trans_presets.java:2470
+#: build/trans_presets.java:2476 build/trans_presets.java:2483
+#: build/trans_presets.java:2490 build/trans_presets.java:2496
+#: build/trans_presets.java:2502 build/trans_presets.java:2524
+#: build/trans_presets.java:2531 build/trans_presets.java:2538
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2563
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2602
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2653
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2676 build/trans_presets.java:2684
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2713 build/trans_presets.java:2740
+msgid "24/7"
+msgstr ""
+
+#: build/trans_presets.java:1383 build/trans_presets.java:1621
+#: build/trans_presets.java:1629 build/trans_presets.java:1636
+#: build/trans_presets.java:1643 build/trans_presets.java:1649
+#: build/trans_presets.java:1656 build/trans_presets.java:1663
+#: build/trans_presets.java:1678 build/trans_presets.java:1686
+#: build/trans_presets.java:1699 build/trans_presets.java:1713
+#: build/trans_presets.java:1810 build/trans_presets.java:1818
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:2226 build/trans_presets.java:2250
+#: build/trans_presets.java:2433 build/trans_presets.java:2470
+#: build/trans_presets.java:2476 build/trans_presets.java:2483
+#: build/trans_presets.java:2490 build/trans_presets.java:2496
+#: build/trans_presets.java:2502 build/trans_presets.java:2524
+#: build/trans_presets.java:2531 build/trans_presets.java:2538
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2563
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2602
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2653
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2676 build/trans_presets.java:2684
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2713 build/trans_presets.java:2740
+msgid "Mo-Fr 08:30-20:00"
+msgstr ""
+
+#: build/trans_presets.java:1383 build/trans_presets.java:1621
+#: build/trans_presets.java:1629 build/trans_presets.java:1636
+#: build/trans_presets.java:1643 build/trans_presets.java:1649
+#: build/trans_presets.java:1656 build/trans_presets.java:1663
+#: build/trans_presets.java:1678 build/trans_presets.java:1686
+#: build/trans_presets.java:1699 build/trans_presets.java:1713
+#: build/trans_presets.java:1810 build/trans_presets.java:1818
+#: build/trans_presets.java:1909 build/trans_presets.java:1915
+#: build/trans_presets.java:2226 build/trans_presets.java:2250
+#: build/trans_presets.java:2433 build/trans_presets.java:2470
+#: build/trans_presets.java:2476 build/trans_presets.java:2483
+#: build/trans_presets.java:2490 build/trans_presets.java:2496
+#: build/trans_presets.java:2502 build/trans_presets.java:2524
+#: build/trans_presets.java:2531 build/trans_presets.java:2538
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2563
+#: build/trans_presets.java:2569 build/trans_presets.java:2575
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2602
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2639
+#: build/trans_presets.java:2646 build/trans_presets.java:2653
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2676 build/trans_presets.java:2684
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2713 build/trans_presets.java:2740
+msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -15478,5 +16854,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1379 build/trans_presets.java:1426
+#: build/trans_presets.java:1385 build/trans_presets.java:1438
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -15486,106 +16862,141 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1388
 msgid "Edit Parking"
 msgstr "Upravit parkoviště"
 
 #. item "Car/Parking" text "Name"
+#. item "Tourism/Information Terminal" text "Operator"
+#. item "Tourism/Audioguide" text "Operator"
+#. item "Amenities/Toilets" text "Operator"
+#. item "Shops/Vending machine" text "Operator"
+#: build/trans_presets.java:1391 build/trans_presets.java:1762
+#: build/trans_presets.java:1772 build/trans_presets.java:2396
+#: build/trans_presets.java:2510
+msgid "Reference number"
+msgstr "Číslo záchodu"
+
+#. item "Car/Parking" combo "Type"
+#: build/trans_presets.java:1392
+msgid "multi-storey"
+msgstr "vícepodlažní"
+
+#: build/trans_presets.java:1392
+msgid "surface"
+msgstr "povrchové"
+
+#: build/trans_presets.java:1392
+msgid "underground"
+msgstr "podzemní"
+
+#: build/trans_presets.java:1393
+#, fuzzy
+msgid "Park and Ride"
+msgstr "park and ride"
+
+#. item "Tourism/Information Terminal" text "Reference number"
+#. item "Tourism/Audioguide" text "Reference number"
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1394 build/trans_presets.java:1763
+#: build/trans_presets.java:1773 build/trans_presets.java:2397
+msgid "Fee"
+msgstr "Poplatek"
+
+#. <space />
+#: build/trans_presets.java:1396
+#, fuzzy
+msgid "Capacity (overall)"
+msgstr "Kapacita"
+
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1397
+msgid "Spaces for Disabled"
+msgstr "Místa pro vozíčkáře"
+
+#: build/trans_presets.java:1398
+#, fuzzy
+msgid "Spaces for Women"
+msgstr "Místa pro vozíčkáře"
+
+#: build/trans_presets.java:1399
+#, fuzzy
+msgid "Spaces for Parents"
+msgstr "Místa pro vozíčkáře"
+
+#: build/trans_presets.java:1400
+msgid "See the Wiki for other capacity:[types]=*."
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1402
+msgid "Wash"
+msgstr "Myčka"
+
+#. item
+#: build/trans_presets.java:1403
+msgid "Edit Car Wash"
+msgstr "Upravit myčku aut"
+
+#. item "Car/Wash" text "Operator"
+#. item "Bicycle/Rental" text "Name"
+#: build/trans_presets.java:1408 build/trans_presets.java:1452
+msgid "Shop"
+msgstr "Obchod"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:1410
+msgid "Edit Car Shop"
+msgstr "Upravit obchod s auty"
+
+#. item "Car/Shop" text "Operator"
+#: build/trans_presets.java:1415
+msgid "Repair"
+msgstr "Opravna"
+
+#. item
+#: build/trans_presets.java:1416
+msgid "Edit Car Repair"
+msgstr "Upravit autoopravnu"
+
+#. item "Car/Repair" text "Operator"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1421 build/trans_presets.java:1445
+msgid "Rental"
+msgstr "Půjčovna"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
+#: build/trans_presets.java:1424
+msgid "Edit Car Rental"
+msgstr "Upravit půjčovnu aut"
+
+#. item "Car/Rental" text "Operator"
+#: build/trans_presets.java:1429
+msgid "Sharing"
+msgstr "Sdílení"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
+#: build/trans_presets.java:1431
+msgid "Edit Car Sharing"
+msgstr "̈́Upravit sdílení aut"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
+#: build/trans_presets.java:1440
+msgid "Edit Bicycle Parking"
+msgstr "Upravit parkoviště pro kola."
+
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1385 build/trans_presets.java:1431
+#: build/trans_presets.java:1443
 msgid "Capacity"
 msgstr "Kapacita"
 
-#. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1386
-msgid "surface"
-msgstr "povrchové"
-
-#: build/trans_presets.java:1386
-msgid "multi-storey"
-msgstr "vícepodlažní"
-
-#: build/trans_presets.java:1386
-msgid "underground"
-msgstr "podzemní"
-
-#: build/trans_presets.java:1386
-msgid "park_and_ride"
-msgstr "park and ride"
-
-#: build/trans_presets.java:1387
-msgid "Spaces for Disabled"
-msgstr "Místa pro vozíčkáře"
-
-#. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1388 build/trans_presets.java:2328
-msgid "Fee"
-msgstr "Poplatek"
-
-#. item "Car/Parking" check "Fee"
-#: build/trans_presets.java:1390
-msgid "Wash"
-msgstr "Myčka"
-
-#. item
-#: build/trans_presets.java:1391
-msgid "Edit Car Wash"
-msgstr "Upravit myčku aut"
-
-#. item "Car/Wash" text "Operator"
-#. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1396 build/trans_presets.java:1440
-msgid "Shop"
-msgstr "Obchod"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1398
-msgid "Edit Car Shop"
-msgstr "Upravit obchod s auty"
-
-#. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1403
-msgid "Repair"
-msgstr "Opravna"
-
-#. item
-#: build/trans_presets.java:1404
-msgid "Edit Car Repair"
-msgstr "Upravit autoopravnu"
-
-#. item "Car/Repair" text "Operator"
-#. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1409 build/trans_presets.java:1433
-msgid "Rental"
-msgstr "Půjčovna"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
-#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1412
-msgid "Edit Car Rental"
-msgstr "Upravit půjčovnu aut"
-
-#. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1417
-msgid "Sharing"
-msgstr "Sdílení"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1419
-msgid "Edit Car Sharing"
-msgstr "̈́Upravit sdílení aut"
-
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1428
-msgid "Edit Bicycle Parking"
-msgstr "Upravit parkoviště pro kola."
-
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1448
 msgid "Edit Bicycle Rental"
 msgstr "Upravit půjčovnu kol"
@@ -15594,15 +17005,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1455
 msgid "Edit Bicycle Shop"
 msgstr "Upravit prodejnu kol"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1460
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1469
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -15610,5 +17021,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1472
 msgid "Railway Halt"
 msgstr "Železniční zastávka"
@@ -15616,5 +17027,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1474
 msgid "Edit Halt"
 msgstr "Upravit železniční zastávku"
@@ -15622,5 +17033,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1481
 msgid "Tram Stop"
 msgstr "Tramvajová zastávka"
@@ -15629,5 +17040,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1484
 msgid "Edit Tram Stop"
 msgstr "Upravit tramvajovou zastávku"
@@ -15635,5 +17046,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1491
 msgid "Railway Platform"
 msgstr "Železniční nástupiště"
@@ -15642,5 +17053,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1494
 msgid "Edit Railway Platform"
 msgstr "Upravit železniční nástupiště"
@@ -15652,5 +17063,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1485 build/trans_presets.java:1527
+#: build/trans_presets.java:1497 build/trans_presets.java:1539
 msgid "Reference (track number)"
 msgstr "Číslo nástupiště"
@@ -15658,10 +17069,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1487 build/trans_presets.java:1529
+#: build/trans_presets.java:1499 build/trans_presets.java:1541
 msgid "Area"
 msgstr "Označit jako plochu"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1489
+#: build/trans_presets.java:1501
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -15670,10 +17081,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1492
+#: build/trans_presets.java:1504
 msgid "Edit Subway Entrance"
 msgstr "Upravit vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1509
 msgid "Wheelchair"
 msgstr "Invalidní vozík"
@@ -15682,5 +17093,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:1514
 msgid "Bus Station"
 msgstr "Autobusové nádraží"
@@ -15689,5 +17100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1517
 msgid "Edit Bus Station"
 msgstr "Upravit autobusové nádraží"
@@ -15695,5 +17106,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1523
 msgid "Bus Stop"
 msgstr "Zastávka autobusu"
@@ -15703,5 +17114,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1527
 msgid "Edit Bus Stop"
 msgstr "Upravit zastávku autobusu"
@@ -15710,8 +17121,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
-#. <key key="amenity" value="hunting_stand" />
-#: build/trans_presets.java:1520 build/trans_presets.java:1722
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:1532 build/trans_presets.java:1785
+#: build/trans_presets.java:2439
 msgid "Shelter"
 msgstr "Přístřešek"
@@ -15719,10 +17128,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1535
 msgid "Bus Platform"
 msgstr "Nástupiště autobusu"
 
 #. item
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1536
 msgid "Edit Bus Platform"
 msgstr "Upravit nástupiště autobusu"
@@ -15730,5 +17139,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1544
 msgid "Taxi"
 msgstr "Stanoviště taxi"
@@ -15736,5 +17145,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1546
 msgid "Edit Taxi station"
 msgstr "Upravit stanoviště taxi"
@@ -15742,5 +17151,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1539
+#: build/trans_presets.java:1551
 msgid "Airport"
 msgstr "Letiště"
@@ -15748,15 +17157,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1541
+#: build/trans_presets.java:1553
 msgid "Edit Airport"
 msgstr "Upravit letiště"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1558
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1547
+#: build/trans_presets.java:1559
 msgid "ICAO"
 msgstr "ICAO"
@@ -15765,5 +17174,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1552
+#: build/trans_presets.java:1564
 msgid "Accomodation"
 msgstr "Ubytování"
@@ -15775,5 +17184,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1553 build/trans_surveyor.java:43
+#: build/trans_presets.java:1565 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -15782,15 +17191,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1556
+#: build/trans_presets.java:1568
 msgid "Edit Hotel"
 msgstr "Upravit hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1571
 msgid "Stars"
 msgstr "Počet hvězdiček"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1573
 msgid "Motel"
 msgstr "Motel"
@@ -15798,20 +17207,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1563
+#: build/trans_presets.java:1575
 msgid "Edit Motel"
 msgstr "Upravit motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1579
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1580
 msgid "Edit Guest House"
 msgstr "Upravit penzion"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1584
 msgid "Chalet"
 msgstr "Horská chata"
@@ -15819,10 +17228,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1574
+#: build/trans_presets.java:1586
 msgid "Edit Chalet"
 msgstr "Upravit horskou chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1590
 msgid "Hostel"
 msgstr "Hostel"
@@ -15830,30 +17239,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1592
 msgid "Edit Hostel"
 msgstr "Upravit hostel"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1596
 msgid "Alpine Hut"
 msgstr "Horská bouda"
 
 #. item
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1597
 msgid "Edit Alpine Hut"
 msgstr "Upravit vysokohorskou boudu"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1602
 msgid "Caravan Site"
 msgstr "Autokemping (karavany)"
 
 #. item
-#: build/trans_presets.java:1591
+#: build/trans_presets.java:1603
 msgid "Edit Caravan Site"
 msgstr "Upravit autokemping (karavany)"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1607
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -15861,10 +17270,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1609
 msgid "Edit Camping Site"
 msgstr "Upravit tábořiště"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1614
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -15875,5 +17284,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1603 build/trans_surveyor.java:47
+#: build/trans_presets.java:1615 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurace"
@@ -15881,5 +17290,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1617
 msgid "Edit Restaurant"
 msgstr "Upravit restauraci"
@@ -15887,5 +17296,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -15893,61 +17302,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1608 build/trans_presets.java:1615
+#: build/trans_presets.java:1620 build/trans_presets.java:1628
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1610
+#: build/trans_presets.java:1623
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -15955,9 +17364,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1625
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1631
 msgid "Cafe"
 msgstr "Kavárna"
@@ -15965,10 +17374,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1633
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
-#. item "Food+Drinks/Cafe" text "Name"
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1638
 msgid "Pub"
 msgstr "Hospoda"
@@ -15976,20 +17384,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1640
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
-#. item "Food+Drinks/Pub" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1645
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1646
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
-#. item "Food+Drinks/Biergarten" text "Name"
-#: build/trans_presets.java:1634
+#: build/trans_presets.java:1651
 msgid "Bar"
 msgstr "Bar"
@@ -15997,10 +17403,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1653
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
-#. item "Food+Drinks/Bar" text "Name"
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1658
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -16008,33 +17413,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1642
+#: build/trans_presets.java:1660
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
-#. item "Food+Drinks/Nightclub" text "Name"
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1666
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1667
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item
-#: build/trans_presets.java:1649
+#: build/trans_presets.java:1668
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
 
-#. item "Tourism/Attraction" text "Name"
-#. item "Tourism/Information Office" text "Name"
-#. item "Amenities/Baby Hatch" text "Operator"
-#: build/trans_presets.java:1652 build/trans_presets.java:1692
-#: build/trans_presets.java:2392
-msgid "Opening Hours"
-msgstr "Otevírací doba"
-
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1654
+#: build/trans_presets.java:1673
 msgid "Museum"
 msgstr "Muzeum"
@@ -16042,10 +17438,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1675
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
-#. item "Tourism/Museum" text "Name"
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1680
 msgid "Zoo"
 msgstr "Zoo"
@@ -16054,10 +17449,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1683
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
-#. item "Tourism/Zoo" text "Name"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1688
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -16065,25 +17459,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1669
+#: build/trans_presets.java:1690
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1693
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1674
+#: build/trans_presets.java:1695
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1696
 msgid "Edit Theme Park"
 msgstr "Upravit zábavní park"
 
-#. item "Tourism/Theme Park" text "Name"
-#: build/trans_presets.java:1679
+#: build/trans_presets.java:1701
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -16091,5 +17484,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1703
 msgid "Edit Artwork"
 msgstr "Upravit umělecké dílo"
@@ -16097,86 +17490,211 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1686
+#: build/trans_presets.java:1708
 msgid "Information Office"
 msgstr "Turistické informační centrum"
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/information" />
-#: build/trans_presets.java:1688
-msgid "Edit Information Office"
-msgstr "Editovat turistické informační centrum"
-
-#. item "Tourism/Information Office" text "Opening Hours"
-#: build/trans_presets.java:1694
+#: build/trans_presets.java:1715
 msgid "Map"
 msgstr "Přehledová mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1698
-msgid "Map Type"
-msgstr "Typ mapy"
-
-#. item "Tourism/Map" combo "Map Type"
-#: build/trans_presets.java:1698
-msgid "map"
-msgstr "mapa"
-
-#: build/trans_presets.java:1698
-msgid "citymap"
-msgstr "plán města"
-
-#: build/trans_presets.java:1698
-msgid "hikingmap"
-msgstr "turistická mapa"
-
-#: build/trans_presets.java:1698
-msgid "bicyclemap"
-msgstr "cyklistická mapa"
+#: build/trans_presets.java:1720
+msgid "Detail Grade"
+msgstr ""
+
+#. item "Tourism/Map" combo "Detail Grade"
+#: build/trans_presets.java:1720
+#, fuzzy
+msgid "topo"
+msgstr "Stop"
+
+#. color tertiary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unclassified"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unsurfaced"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>20000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="residential"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="living_street"/>
+#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_style.java:635 build/trans_style.java:651
+#: build/trans_style.java:659
+msgid "street"
+msgstr "ulice"
+
+#: build/trans_presets.java:1720
+#, fuzzy
+msgid "scheme"
+msgstr "čínská"
+
+#: build/trans_presets.java:1721
+#, fuzzy
+msgid "Shown Area"
+msgstr "Stáhnout plochu"
+
+#. item "Tourism/Map" combo "Shown Area"
+#: build/trans_presets.java:1721
+#, fuzzy
+msgid "site"
+msgstr "Vložit"
+
+#: build/trans_presets.java:1721
+#, fuzzy
+msgid "city"
+msgstr "Velkoměsto"
+
+#: build/trans_presets.java:1721
+#, fuzzy
+msgid "region"
+msgstr "místní"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1699 build/trans_presets.java:1706
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1722 build/trans_presets.java:1738
+#: build/trans_presets.java:1782
 msgid "Closer Description"
 msgstr "Bližší popis"
 
 #. item "Tourism/Map" text "Closer Description"
-#: build/trans_presets.java:1701
+#. <space />
+#. item "Tourism/Guidepost" text "Elevation"
+#. <space />
+#: build/trans_presets.java:1724 build/trans_presets.java:1747
+msgid "Routes shown for:"
+msgstr ""
+
+#. item "Tourism/Map" check "Hiking"
+#. item "Tourism/Guidepost" check "Hiking"
+#: build/trans_presets.java:1726 build/trans_presets.java:1749
+#: build/trans_presets.java:1955
+msgid "Cycling"
+msgstr "Cyklistika"
+
+#. item "Tourism/Map" check "Cycling"
+#. item "Tourism/Guidepost" check "Cycling"
+#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#, fuzzy
+msgid "Mountainbiking"
+msgstr "horská turistická stezka"
+
+#. item "Tourism/Map" check "Mountainbiking"
+#. item "Tourism/Guidepost" check "Mountainbiking"
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
+#: build/trans_presets.java:2009
+msgid "Skiing"
+msgstr "Lyžování"
+
+#. item "Tourism/Map" check "Skiing"
+#. item "Tourism/Guidepost" check "Skiing"
+#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#, fuzzy
+msgid "Riding"
+msgstr "paralelní pomocná dráha"
+
+#. item "Tourism/Map" check "Riding"
+#. item "Tourism/Guidepost" check "Riding"
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+msgid "... other transportation modes possible"
+msgstr ""
+
+#. item "Tourism/Map" label "... other transportation modes possible"
+#: build/trans_presets.java:1732
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1705
-msgid "Board Type"
-msgstr "Typ nástěnky"
-
-#. item "Tourism/Information Board" combo "Board Type"
-#: build/trans_presets.java:1705
-msgid "board"
-msgstr "obecná nástěnka"
-
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1737
+#, fuzzy
+msgid "Board Content"
+msgstr "Hraniční kontrola"
+
+#. item "Tourism/Information Board" combo "Board Content"
+#: build/trans_presets.java:1737
+#, fuzzy
+msgid "notice"
+msgstr "pro začátečníky (zelená)"
+
+#: build/trans_presets.java:1737
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1737
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1737
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
+#: build/trans_presets.java:1737
+#, fuzzy
+msgid "plants"
+msgstr "využití oblasti (landuse)"
+
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1708
-msgid "Guidepost (Hiking)"
+#: build/trans_presets.java:1740
+#, fuzzy
+msgid "Guidepost"
 msgstr "Rozcestník (pěší)"
 
-#. item "Tourism/Guidepost (Hiking)" text "Elevation"
-#: build/trans_presets.java:1715
+#. item "Tourism/Guidepost" label "... other transportation modes possible"
+#: build/trans_presets.java:1755
+#, fuzzy
+msgid "Information Terminal"
+msgstr "Informace"
+
+#. item "Tourism/Information Terminal" text "Name"
+#. item "Tourism/Audioguide" text "Name"
+#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#, fuzzy
+msgid "Closer description"
+msgstr "Bližší popis"
+
+#: build/trans_presets.java:1765
+#, fuzzy
+msgid "Audioguide"
+msgstr "Zvuk"
+
+#. <space />
+#: build/trans_presets.java:1775
+msgid "Audioguide via mobile phone?"
+msgstr ""
+
+#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
+#: build/trans_presets.java:1776
+#, fuzzy
+msgid "Phone number"
+msgstr "Telefonní číslo"
+
+#. item "Tourism/Audioguide" text "Phone number"
+#: build/trans_presets.java:1778
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
 #. item
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1786
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -16184,25 +17702,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1726 build/trans_presets.java:1732
+#: build/trans_presets.java:1789 build/trans_presets.java:1795
 msgid "Fireplace"
 msgstr "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1728
+#: build/trans_presets.java:1791
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item
-#: build/trans_presets.java:1729
+#: build/trans_presets.java:1792
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1798
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1799
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -16211,20 +17729,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1739
+#: build/trans_presets.java:1802
 msgid "Edit Castle"
 msgstr "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1806
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item
-#: build/trans_presets.java:1744
+#: build/trans_presets.java:1807
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
-#. item "Historic Places/Ruins" text "Name"
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:1812
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -16233,10 +17750,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1751
+#: build/trans_presets.java:1815
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
-#. item "Historic Places/Archaeological Site" text "Name"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1820
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -16244,5 +17760,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1757
+#: build/trans_presets.java:1822
 msgid "Edit Battlefield"
 msgstr "Upravit bojiště"
@@ -16250,15 +17766,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1827
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:1828
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1767
+#: build/trans_presets.java:1832
 msgid "Memorial"
 msgstr "Památník"
@@ -16266,45 +17782,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1769
+#: build/trans_presets.java:1834
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1838
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1839
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1843
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item
-#: build/trans_presets.java:1779
+#: build/trans_presets.java:1844
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1784
+#: build/trans_presets.java:1849
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1785
+#: build/trans_presets.java:1850
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1851
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1855
 msgid "Playground"
 msgstr "Hřiště"
@@ -16312,15 +17828,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1857
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1861
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1862
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
@@ -16328,15 +17844,15 @@
 #. item "Leisure/Fishing" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1868
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1869
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1805
+#: build/trans_presets.java:1870
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -16350,6 +17866,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1809 build/trans_presets.java:1818
-#: build/trans_presets.java:1827 build/trans_presets.java:1836
+#: build/trans_presets.java:1874 build/trans_presets.java:1883
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -16741,30 +18257,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
-#: build/trans_style.java:3613 build/trans_style.java:3621
-#: build/trans_style.java:3629 build/trans_style.java:3637
-#: build/trans_style.java:3645 build/trans_style.java:3653
-#: build/trans_style.java:3661 build/trans_style.java:3669
-#: build/trans_style.java:3677 build/trans_style.java:3685
-#: build/trans_style.java:3693 build/trans_style.java:3701
-#: build/trans_style.java:3709 build/trans_style.java:3717
-#: build/trans_style.java:3725 build/trans_style.java:3733
-#: build/trans_style.java:3741 build/trans_style.java:3749
-#: build/trans_style.java:3757 build/trans_style.java:3765
-#: build/trans_style.java:3773 build/trans_style.java:3781
-#: build/trans_style.java:3789 build/trans_style.java:3797
-#: build/trans_style.java:3805 build/trans_style.java:3813
-#: build/trans_style.java:3821 build/trans_style.java:3829
-#: build/trans_style.java:3837 build/trans_style.java:3845
-#: build/trans_style.java:3853 build/trans_style.java:3861
-#: build/trans_style.java:3869 build/trans_style.java:3877
-#: build/trans_style.java:3885 build/trans_style.java:3893
-#: build/trans_style.java:3901 build/trans_style.java:3909
-#: build/trans_style.java:3917 build/trans_style.java:3925
-#: build/trans_style.java:3933 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_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: 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 build/trans_style.java:3892
+#: build/trans_style.java:3900 build/trans_style.java:3908
+#: build/trans_style.java:3916 build/trans_style.java:3924
+#: build/trans_style.java:3932
 msgid "sport"
 msgstr "sport"
@@ -16774,227 +18290,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "football"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1811 build/trans_presets.java:1820
-#: build/trans_presets.java:1829 build/trans_presets.java:1838
+#: build/trans_presets.java:1876 build/trans_presets.java:1885
+#: build/trans_presets.java:1894 build/trans_presets.java:1903
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1878
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1879
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1887
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item
-#: build/trans_presets.java:1823
+#: build/trans_presets.java:1888
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1831
+#: build/trans_presets.java:1896
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1897
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1840
+#: build/trans_presets.java:1905
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1906
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
-#. item "Sport Facilities/Golf Course" text "Name"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:1911
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1846
+#: build/trans_presets.java:1912
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
-#. item "Sport Facilities/Miniature Golf" text "Name"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1918
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1852
+#: build/trans_presets.java:1919
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1920
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -17033,248 +18547,240 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1934
-#: build/trans_presets.java:1940 build/trans_presets.java:1949
-#: build/trans_presets.java:1956 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
-#: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2054 build/trans_presets.java:2060
+#: build/trans_presets.java:1923 build/trans_presets.java:1929
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2016
+#: build/trans_presets.java:2023 build/trans_presets.java:2031
+#: build/trans_presets.java:2037 build/trans_presets.java:2043
+#: build/trans_presets.java:2049 build/trans_presets.java:2055
+#: build/trans_presets.java:2061 build/trans_presets.java:2067
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1934
-#: build/trans_presets.java:1940 build/trans_presets.java:1949
-#: build/trans_presets.java:1956 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
-#: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2054 build/trans_presets.java:2060
+#: build/trans_presets.java:1923 build/trans_presets.java:1929
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2016
+#: build/trans_presets.java:2023 build/trans_presets.java:2031
+#: build/trans_presets.java:2037 build/trans_presets.java:2043
+#: build/trans_presets.java:2049 build/trans_presets.java:2055
+#: build/trans_presets.java:2061 build/trans_presets.java:2067
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:1856 build/trans_presets.java:1862
-#: build/trans_presets.java:1868 build/trans_presets.java:1874
-#: build/trans_presets.java:1880 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1898
-#: build/trans_presets.java:1904 build/trans_presets.java:1910
-#: build/trans_presets.java:1916 build/trans_presets.java:1922
-#: build/trans_presets.java:1928 build/trans_presets.java:1934
-#: build/trans_presets.java:1940 build/trans_presets.java:1949
-#: build/trans_presets.java:1956 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2012
-#: build/trans_presets.java:2018 build/trans_presets.java:2024
-#: build/trans_presets.java:2030 build/trans_presets.java:2036
-#: build/trans_presets.java:2042 build/trans_presets.java:2048
-#: build/trans_presets.java:2054 build/trans_presets.java:2060
+#: build/trans_presets.java:1923 build/trans_presets.java:1929
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:1953
+#: build/trans_presets.java:1959 build/trans_presets.java:1965
+#: build/trans_presets.java:1971 build/trans_presets.java:1977
+#: build/trans_presets.java:1983 build/trans_presets.java:1989
+#: build/trans_presets.java:1995 build/trans_presets.java:2001
+#: build/trans_presets.java:2007 build/trans_presets.java:2016
+#: build/trans_presets.java:2023 build/trans_presets.java:2031
+#: build/trans_presets.java:2037 build/trans_presets.java:2043
+#: build/trans_presets.java:2049 build/trans_presets.java:2055
+#: build/trans_presets.java:2061 build/trans_presets.java:2067
+#: build/trans_presets.java:2073 build/trans_presets.java:2079
+#: build/trans_presets.java:2085 build/trans_presets.java:2091
+#: build/trans_presets.java:2097 build/trans_presets.java:2103
+#: build/trans_presets.java:2109 build/trans_presets.java:2115
+#: build/trans_presets.java:2121 build/trans_presets.java:2127
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1858
+#: build/trans_presets.java:1925
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1926
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1931
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1932
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1937
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1938
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1943
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1944
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1949
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1950
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
-#: build/trans_presets.java:1888
-msgid "Cycling"
-msgstr "Cyklistika"
-
-#. item
-#: build/trans_presets.java:1889
+#. item
+#: build/trans_presets.java:1956
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1961
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1962
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:1900
+#: build/trans_presets.java:1967
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item
-#: build/trans_presets.java:1901
+#: build/trans_presets.java:1968
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1973
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item
-#: build/trans_presets.java:1907
+#: build/trans_presets.java:1974
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1979
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1980
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1985
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1986
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1991
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1992
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1997
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1998
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:1936
+#: build/trans_presets.java:2003
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:2004
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
 
-#: build/trans_presets.java:1942
-msgid "Skiing"
-msgstr "Lyžování"
-
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:2011
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2014
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2014
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2014
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2014
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2015
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2015
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2015
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2015
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2015
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2015
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:1948
+#: build/trans_presets.java:2015
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:1951
+#: build/trans_presets.java:2018
 msgid "Shooting"
 msgstr "Střelba"
@@ -17282,178 +18788,178 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2020
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2026
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:2027
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:2028
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:2033
 msgid "Football"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:2034
 msgid "Edit Football"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:2039
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:2040
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:2045
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:2046
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:2051
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:2052
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:2057
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2058
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2061
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:2063
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2064
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:2069
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2070
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2075
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2076
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2081
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2082
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2087
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2088
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2093
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2094
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2099
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2100
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2105
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2106
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2044
+#: build/trans_presets.java:2111
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2112
 msgid "Edit Rugby"
 msgstr "Upravit ragby"
 
-#: build/trans_presets.java:2050
+#: build/trans_presets.java:2117
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2118
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2056
+#: build/trans_presets.java:2123
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2124
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
 #. <separator/>
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2131
 msgid "Buildings"
 msgstr "Budovy"
 
 #. group "Buildings"
-#: build/trans_presets.java:2065
+#: build/trans_presets.java:2132
 msgid "Building"
 msgstr "Budova"
@@ -17461,5 +18967,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2135
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -17467,10 +18973,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2137
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2141
 msgid "Town hall"
 msgstr "Radnice"
@@ -17478,10 +18984,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2143
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2147
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -17489,10 +18995,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2149
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2153
 msgid "Courthouse"
 msgstr "Soud"
@@ -17501,10 +19007,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2089
+#: build/trans_presets.java:2156
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2160
 msgid "Prison"
 msgstr "Vězení"
@@ -17513,10 +19019,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2163
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2167
 msgid "Police"
 msgstr "Policie"
@@ -17526,10 +19032,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2171
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2175
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -17538,10 +19044,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2178
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2182
 msgid "Post Office"
 msgstr "Pošta"
@@ -17549,5 +19055,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2184
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -17555,15 +19061,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2189
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2190
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2194
 msgid "School"
 msgstr "Škola"
@@ -17571,10 +19077,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2129
+#: build/trans_presets.java:2196
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2200
 msgid "University"
 msgstr "Vysoká škola"
@@ -17582,10 +19088,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2202
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2206
 msgid "College"
 msgstr "Střední škola"
@@ -17593,5 +19099,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2208
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -17599,5 +19105,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2213
 msgid "Cinema"
 msgstr "Kino"
@@ -17606,10 +19112,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2216
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2220
 msgid "Library"
 msgstr "Knihovna"
@@ -17618,10 +19124,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2223
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
-#. item "Buildings/Library" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2228
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -17629,10 +19134,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2162
+#: build/trans_presets.java:2230
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2234
 msgid "Theatre"
 msgstr "Divadlo"
@@ -17641,10 +19146,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2237
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2173
+#: build/trans_presets.java:2241
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -17654,5 +19159,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2245
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -17661,6 +19166,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "Religion"
 msgstr "Náboženství"
@@ -17669,66 +19174,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2180 build/trans_presets.java:2901
-#: build/trans_presets.java:2910
+#: build/trans_presets.java:2248 build/trans_presets.java:3029
+#: build/trans_presets.java:3038
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "Denomination"
 msgstr "Vyznání"
@@ -17737,81 +19242,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2181 build/trans_presets.java:2902
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2249 build/trans_presets.java:3030
+#: build/trans_presets.java:3039
 msgid "sunni"
 msgstr "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2253
 msgid "Addresses"
 msgstr "Adresy"
@@ -17820,5 +19325,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2187
+#: build/trans_presets.java:2256
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -17826,5 +19331,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2258
 msgid "House number"
 msgstr "Číslo domu"
@@ -17832,20 +19337,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2260
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2193
+#: build/trans_presets.java:2262
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2263
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2264
 msgid "Country code"
 msgstr "Kód země"
@@ -17853,5 +19358,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2267
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -17860,5 +19365,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2270
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -17866,71 +19371,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2272
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2272
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2272
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2203
-msgid "all"
-msgstr "všechny"
-
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2272
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2275
 msgid "Man Made"
 msgstr "Umělé konstrukce"
 
 #. group "Man Made"
-#: build/trans_presets.java:2207
+#: build/trans_presets.java:2276
 msgid "Works"
 msgstr "Továrna"
 
 #. item
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2277
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2281
 msgid "Tower"
 msgstr "Věž"
 
 #. item
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2282
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2286
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2287
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2222
+#: build/trans_presets.java:2291
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2292
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2296
 msgid "Lighthouse"
 msgstr "Maják"
@@ -17938,10 +19439,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2298
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2233
+#: build/trans_presets.java:2302
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -17949,10 +19450,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2304
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2239
+#: build/trans_presets.java:2308
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -17960,10 +19461,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2310
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2245
+#: build/trans_presets.java:2314
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -17973,10 +19474,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2318
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2322
 msgid "Crane"
 msgstr "Jeřáb"
@@ -17984,10 +19485,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2255
+#: build/trans_presets.java:2324
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2328
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -17995,10 +19496,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2330
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2265
+#: build/trans_presets.java:2334
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -18006,10 +19507,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2336
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2271
+#: build/trans_presets.java:2340
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -18017,5 +19518,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2342
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
@@ -18023,5 +19524,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2347
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -18031,39 +19532,39 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2351
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2353
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2353
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2353
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2353
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2353
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2353
 msgid "photovoltaic"
 msgstr "sluneční"
 
-#: build/trans_presets.java:2284
+#: build/trans_presets.java:2353
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2356
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -18072,10 +19573,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2290
+#: build/trans_presets.java:2359
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2363
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -18084,5 +19585,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2366
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -18090,10 +19591,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2300 build/trans_presets.java:2316
+#: build/trans_presets.java:2369 build/trans_presets.java:2385
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2371
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -18104,5 +19605,5 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2307
+#: build/trans_presets.java:2376
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
@@ -18110,5 +19611,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2379
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -18117,46 +19618,40 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2382
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2386
 msgid "Voltage"
 msgstr "Napětí"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2387
 msgid "Amount of Wires"
 msgstr "Počet drátů tvořících vodič"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2390
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2391
 msgid "Toilets"
 msgstr "Záchody"
 
-#. item "Amenities/Toilets" text "Operator"
-#. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:2327 build/trans_presets.java:2419
-msgid "Reference number"
-msgstr "Číslo záchodu"
-
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2329 build/trans_presets.java:2420
+#: build/trans_presets.java:2398 build/trans_presets.java:2511
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2400
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2405
 msgid "Telephone"
 msgstr "Telefon"
@@ -18165,5 +19660,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2408
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -18171,5 +19666,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2342 build/trans_presets.java:2421
+#: build/trans_presets.java:2411 build/trans_presets.java:2512
 msgid "Coins"
 msgstr "Mince"
@@ -18177,5 +19672,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2343 build/trans_presets.java:2422
+#: build/trans_presets.java:2412 build/trans_presets.java:2513
 msgid "Notes"
 msgstr "Bankovky"
@@ -18183,5 +19678,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2344 build/trans_presets.java:2423
+#: build/trans_presets.java:2413 build/trans_presets.java:2514
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -18189,5 +19684,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2345 build/trans_presets.java:2424
+#: build/trans_presets.java:2414 build/trans_presets.java:2515
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -18195,15 +19690,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2346 build/trans_presets.java:2425
+#: build/trans_presets.java:2415 build/trans_presets.java:2516
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2416
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2418
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -18212,5 +19707,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2421
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -18218,80 +19713,76 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2423
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2424
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2425
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2357
+#: build/trans_presets.java:2426
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2427
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2428
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2430
 msgid "Bench"
 msgstr "Lavička"
 
-#. item
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
-#. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2435
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2436
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
 
-#. item "Amenities/Hunting Stand" check "Shelter"
-#: build/trans_presets.java:2369
+#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
+#. <key key="amenity" value="hunting_stand" />
+#. item "Land use/Tree" text "Type"
+#: build/trans_presets.java:2438 build/trans_presets.java:2899
+msgid "Height"
+msgstr "Výška"
+
+#. item "Amenities/Hunting Stand" combo "Height"
+#: build/trans_presets.java:2438
+msgid "low"
+msgstr "nízká"
+
+#: build/trans_presets.java:2438
+msgid "half"
+msgstr "střední"
+
+#: build/trans_presets.java:2438
+msgid "full"
+msgstr "plná"
+
+#: build/trans_presets.java:2440
 msgid "Hide"
 msgstr "Úkryt"
 
-#. item "Amenities/Hunting Stand" check "Hide"
-#: build/trans_presets.java:2370
+#: build/trans_presets.java:2441
 msgid "Lock"
 msgstr "Uzamknutelný"
 
-#. item "Amenities/Hunting Stand" check "Lock"
-#. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2371 build/trans_presets.java:2771
-msgid "Height"
-msgstr "Výška"
-
-#. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2371
-msgid "low"
-msgstr "nízká"
-
-#: build/trans_presets.java:2371
-msgid "half"
-msgstr "střední"
-
-#: build/trans_presets.java:2371
-msgid "full"
-msgstr "plná"
-
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2443
 msgid "Fountain"
 msgstr "Fontána"
@@ -18300,10 +19791,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2446
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2450
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -18312,10 +19803,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2383
+#: build/trans_presets.java:2453
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2457
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -18323,25 +19814,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2459
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2395
+#: build/trans_presets.java:2465
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2466
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2397
+#: build/trans_presets.java:2467
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
-#. item "Shops/Supermarket" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2472
+#, fuzzy
+msgid "Chemist"
+msgstr "Horská chata"
+
+#. item
+#: build/trans_presets.java:2473
+#, fuzzy
+msgid "Edit Chemist"
+msgstr "Upravit horskou chatu"
+
+#: build/trans_presets.java:2478
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -18349,10 +19850,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2403
+#: build/trans_presets.java:2480
 msgid "Edit Convenience Store"
 msgstr "Upravit večerku"
 
-#. item "Shops/Convenience Store" text "Name"
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2485
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -18360,10 +19860,29 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2409
+#: build/trans_presets.java:2487
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
-#. item "Shops/Kiosk" text "Name"
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2492
+msgid "Book Store"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2493
+#, fuzzy
+msgid "Edit Book Store"
+msgstr "Upravit zastávku autobusu"
+
+#: build/trans_presets.java:2498
+msgid "Travel Agency"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:2499
+#, fuzzy
+msgid "Edit Travel Agency"
+msgstr "Upravit strom"
+
+#: build/trans_presets.java:2504
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -18371,5 +19890,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2506
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -18377,88 +19896,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2508
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2517
 msgid "Account or loyalty cards"
 msgstr "Zůstatkové nebo věrnostní karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2519
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -18466,10 +19985,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2521
 msgid "Edit Butcher"
 msgstr "Upravit řeznictví"
 
-#. item "Shops/Butcher" text "Name"
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2526
 msgid "Baker"
 msgstr "Pekařství"
@@ -18477,10 +19995,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2528
 msgid "Edit Baker"
 msgstr "Upravit pekařství"
 
-#. item "Shops/Baker" text "Name"
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2533
 msgid "Florist"
 msgstr "Květinářství"
@@ -18488,20 +20005,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2535
 msgid "Edit Florist"
 msgstr "Upravit květinářství"
 
-#. item "Shops/Florist" text "Name"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2540
 msgid "Organic"
 msgstr "Obchod se zdravou výživou"
 
 #. item
-#: build/trans_presets.java:2447
+#: build/trans_presets.java:2541
 msgid "Edit Organic Shop"
 msgstr "Upravit obchod se zdravou výživou"
 
-#. item "Shops/Organic" text "Name"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2546
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -18509,60 +20024,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2548
 msgid "Edit Alcohol Shop"
 msgstr "Upravit obchod s alkoholem"
 
-#. item "Shops/Alcohol" text "Name"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2553
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2458
+#: build/trans_presets.java:2554
 msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
-#. item "Shops/Beverages" text "Name"
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2559
 msgid "Computer"
 msgstr "Počítače"
 
 #. item
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2560
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
-#. item "Shops/Computer" text "Name"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2565
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2566
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
-#. item "Shops/Electronics" text "Name"
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2571
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2473
+#: build/trans_presets.java:2572
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
-#. item "Shops/Hifi" text "Name"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2577
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2578
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
-#. item "Shops/Furniture" text "Name"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2583
 msgid "Garden Centre"
 msgstr "Zahradnické centrum"
@@ -18570,10 +20079,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2585
 msgid "Edit Garden Centre"
 msgstr "Upravit zahradnické centrum"
 
-#. item "Shops/Garden Centre" text "Name"
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2590
 msgid "Hardware"
 msgstr "Železářství"
@@ -18581,10 +20089,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2592
 msgid "Edit Hardware Store"
 msgstr "Upravit železářství"
 
-#. item "Shops/Hardware" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2597
 msgid "Do-it-yourself-store"
 msgstr "Zboží pro kutily"
@@ -18592,60 +20099,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2599
 msgid "Edit Do-it-yourself-store"
 msgstr "Upravit obchod se zbožím pro kutily"
 
-#. item "Shops/Do-it-yourself-store" text "Name"
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2604
 msgid "Stationery"
 msgstr "Papírnictví"
 
 #. item
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2605
 msgid "Edit Stationery Shop"
 msgstr "Upravit papírnictví"
 
-#. item "Shops/Stationery" text "Name"
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2610
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2611
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
-#. item "Shops/Hairdresser" text "Name"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2616
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2617
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
-#. item "Shops/Shoes" text "Name"
-#: build/trans_presets.java:2515
+#: build/trans_presets.java:2622
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2623
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
-#. item "Shops/Toys" text "Name"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2628
 msgid "Video"
 msgstr "Videopůjčovna/prodejna"
 
 #. item
-#: build/trans_presets.java:2521
+#: build/trans_presets.java:2629
 msgid "Edit Video Shop"
 msgstr "Upravit videopůjčovnu/prodejnu"
 
-#. item "Shops/Video" text "Name"
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2634
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -18653,10 +20154,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2527
+#: build/trans_presets.java:2636
 msgid "Edit Dry Cleaning"
 msgstr "Upravit čistírnu"
 
-#. item "Shops/Dry Cleaning" text "Name"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2641
 msgid "Laundry"
 msgstr "Prádelna"
@@ -18664,10 +20164,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2643
 msgid "Edit Laundry"
 msgstr "Upravit prádelnu"
 
-#. item "Shops/Laundry" text "Name"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2648
 msgid "Outdoor"
 msgstr "Vybavení do přírody"
@@ -18675,35 +20174,32 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2539
+#: build/trans_presets.java:2650
 msgid "Edit Outdoor Shop"
 msgstr "Obchod s vybavením do přírody"
 
-#. item "Shops/Outdoor" text "Name"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2655
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2656
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
-#. item "Shops/Sports" text "Name"
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2661
 msgid "Optician"
 msgstr "Oční optik"
 
 #. item
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2662
 msgid "Edit Optician"
 msgstr "Upravit oční optiku"
 
-#. item "Shops/Optician" text "Name"
-#: build/trans_presets.java:2555
+#: build/trans_presets.java:2669
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2670
 msgid "Bank"
 msgstr "Banka"
@@ -18711,16 +20207,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2558
+#: build/trans_presets.java:2672
 msgid "Edit Bank"
 msgstr "Upravit banku"
 
-#. item "Cash/Bank" text "Name"
-#. item "Cash/Money Exchange" text "Name"
-#: build/trans_presets.java:2561 build/trans_presets.java:2569
+#: build/trans_presets.java:2677 build/trans_presets.java:2686
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2679
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -18728,5 +20222,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2681
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -18734,15 +20228,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2688
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2576
+#: build/trans_presets.java:2693
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2694
 msgid "Doctors"
 msgstr "Středisko"
@@ -18750,20 +20244,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2696
 msgid "Edit Doctors"
 msgstr "Upravit středisko"
 
-#. item "Health/Doctors" text "Name"
-#: build/trans_presets.java:2583
+#: build/trans_presets.java:2701
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2702
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
-#. item "Health/Dentist" text "Name"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2707
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -18771,5 +20263,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2709
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -18777,10 +20269,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2711
 msgid "Dispensing"
 msgstr "Vydává léky na předpis"
 
-#. item "Health/Pharmacy" text "Name"
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2715
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -18788,10 +20279,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2717
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2601
+#: build/trans_presets.java:2721
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -18800,5 +20291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2724
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -18807,20 +20298,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2727
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2728
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2730
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2731
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -18828,5 +20319,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2734
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -18835,55 +20326,55 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2617
+#: build/trans_presets.java:2737
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
 #. group "Places"
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2745
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2746
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2751
 msgid "Country"
 msgstr "Stát"
 
 #. item
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2752
 msgid "Edit Country"
 msgstr "Upravit stát"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2757
 msgid "State"
 msgstr "Země"
 
 #. item
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2758
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2642
+#: build/trans_presets.java:2763
 msgid "Region"
 msgstr "Kraj"
 
 #. item
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2764
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2769
 msgid "County"
 msgstr "Okres"
 
 #. item
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2770
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -18891,15 +20382,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2776
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2777
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2782
 msgid "Town"
 msgstr "Město"
@@ -18907,10 +20398,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2663
+#: build/trans_presets.java:2784
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2789
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -18918,25 +20409,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2670
+#: build/trans_presets.java:2791
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2796
 msgid "Village"
 msgstr "Obec"
 
 #. item
-#: build/trans_presets.java:2676
+#: build/trans_presets.java:2797
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2681
+#: build/trans_presets.java:2802
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2803
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -18944,5 +20435,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2688
+#: build/trans_presets.java:2809
 msgid "Locality"
 msgstr "Místní název"
@@ -18950,10 +20441,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2690
+#: build/trans_presets.java:2811
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2695
+#: build/trans_presets.java:2816
 msgid "Island"
 msgstr "Ostrov"
@@ -18961,11 +20452,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2818
 msgid "Edit Island"
 msgstr "Upravit ostrov"
 
 #. item "Places/Island" text "Name"
+#: build/trans_presets.java:2823
+#, fuzzy
+msgid "Islet"
+msgstr "vlevo"
+
+#. item
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
+#: build/trans_presets.java:2825
+#, fuzzy
+msgid "Edit Islet"
+msgstr "Upravit horskou chatu"
+
+#. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2703
+#: build/trans_presets.java:2831
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -18973,10 +20477,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2833
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2709
+#: build/trans_presets.java:2837
 msgid "Peak"
 msgstr "Vrchol"
@@ -18984,10 +20488,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2711
+#: build/trans_presets.java:2839
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2844
 msgid "Glacier"
 msgstr "Ledovec"
@@ -18995,10 +20499,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2846
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2851
 msgid "Volcano"
 msgstr "Sopka"
@@ -19006,70 +20510,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2853
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2859
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2860
 msgid "National"
 msgstr "Národní"
 
 #. item
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2861
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2866
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item
-#: build/trans_presets.java:2739
+#: build/trans_presets.java:2867
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2744
+#: build/trans_presets.java:2872
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2873
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2750
+#: build/trans_presets.java:2878
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2879
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2884
 msgid "National park"
 msgstr "Národní park"
 
 #. item
-#: build/trans_presets.java:2757
+#: build/trans_presets.java:2885
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2891
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2764
+#: build/trans_presets.java:2892
 msgid "Tree"
 msgstr "Strom"
@@ -19078,15 +20582,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2895
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2900
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2902
 msgid "Wood"
 msgstr "Prales"
@@ -19095,5 +20599,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2905
 msgid "Edit Wood"
 msgstr "Editovat Prales"
@@ -19101,17 +20605,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2780 build/trans_presets.java:2789
+#: build/trans_presets.java:2908 build/trans_presets.java:2917
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:2780 build/trans_presets.java:2789
+#: build/trans_presets.java:2908 build/trans_presets.java:2917
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2780 build/trans_presets.java:2789
+#: build/trans_presets.java:2908 build/trans_presets.java:2917
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2910
 msgid "Forest"
 msgstr "Les"
@@ -19120,14 +20624,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2913
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2919
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2920
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -19135,25 +20639,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2925
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item
-#: build/trans_presets.java:2798
+#: build/trans_presets.java:2926
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2930
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2931
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2935
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -19161,10 +20665,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2937
 msgid "Edit Fell"
 msgstr "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2941
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -19172,5 +20676,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2943
 msgid "Edit Heath"
 msgstr "Upravit vřesoviště"
@@ -19178,5 +20682,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2948
 msgid "Farmyard"
 msgstr "Farma"
@@ -19185,45 +20689,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2951
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2956
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2957
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2962
 msgid "Meadow"
 msgstr "Louka"
 
 #. item
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:2963
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2968
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2969
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2846
+#: build/trans_presets.java:2974
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2975
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -19231,25 +20735,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:2981
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2982
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:2986
 msgid "Grass"
 msgstr "Tráva"
 
 #. item
-#: build/trans_presets.java:2859
+#: build/trans_presets.java:2987
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2992
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -19257,10 +20761,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:2994
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2999
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -19268,20 +20772,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3001
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:3005
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3006
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:3010
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -19289,5 +20793,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3012
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -19295,15 +20799,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2890
+#: build/trans_presets.java:3018
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3019
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3024
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -19311,9 +20815,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:3026
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3032
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -19321,39 +20825,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:3034
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:3041
 msgid "Retail"
 msgstr "Obchody"
 
 #. item
-#: build/trans_presets.java:2914
+#: build/trans_presets.java:3042
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:3047
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3048
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2925
+#: build/trans_presets.java:3053
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:3054
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:3059
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -19361,15 +20865,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:3061
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:3066
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:3067
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -19377,55 +20881,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:3073
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:3074
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3079
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3080
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3085
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3086
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3091
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3092
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3097
 msgid "Quarry"
 msgstr "Lom"
 
 #. item
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:3098
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
 
 #. group "Relations"
-#: build/trans_presets.java:2979
+#: build/trans_presets.java:3107
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19435,5 +20939,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3111
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -19442,10 +20946,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3117
 msgid "outer segment"
 msgstr "vnější část"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3118
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -19453,5 +20957,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:3121
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -19460,5 +20964,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3124
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -19466,34 +20970,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3126
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3126
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3126
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3126
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3126
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3126
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3126
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:2998
+#: build/trans_presets.java:3126
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -19502,15 +21006,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3003
+#: build/trans_presets.java:3131
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3132
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:3133
 msgid "to way"
 msgstr "na cestu"
@@ -19518,5 +21022,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3136
 msgid "Route"
 msgstr "Trasa"
@@ -19525,5 +21029,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3139
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -19531,5 +21035,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3141
 msgid "Route type"
 msgstr "Typ trasy"
@@ -19601,5 +21105,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3013 build/trans_style.java:233
+#: build/trans_presets.java:3141 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -19608,17 +21112,17 @@
 msgstr "bicykl"
 
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3141
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3141
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3141
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3141
 msgid "ski"
 msgstr "lyžařská"
@@ -19671,5 +21175,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3013 build/trans_style.java:247
+#: build/trans_presets.java:3141 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -19678,13 +21182,13 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3141
 msgid "hiking"
 msgstr "turistická"
 
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3141
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3141
 msgid "detour"
 msgstr "objízdná"
@@ -19698,10 +21202,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3013 build/trans_style.java:1206
+#: build/trans_presets.java:3141 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3016
+#: build/trans_presets.java:3144
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -19709,31 +21213,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3147
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3149
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3149
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3149
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3149
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3149
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3150
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -19742,30 +21246,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3025
+#: build/trans_presets.java:3153
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3154
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3155
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3156
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3157
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3030
+#: build/trans_presets.java:3158
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -20203,11 +21707,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3424 build/trans_style.java:3425
-#: build/trans_style.java:3995 build/trans_style.java:4295
-#: build/trans_style.java:4304 build/trans_style.java:4313
-#: build/trans_style.java:4322 build/trans_style.java:4331
-#: build/trans_style.java:4340 build/trans_style.java:4349
-#: build/trans_style.java:4350 build/trans_style.java:4359
-#: build/trans_style.java:4368
+#: build/trans_style.java:3375 build/trans_style.java:3376
+#: build/trans_style.java:3946 build/trans_style.java:4254
+#: build/trans_style.java:4263 build/trans_style.java:4272
+#: build/trans_style.java:4281 build/trans_style.java:4290
+#: build/trans_style.java:4299 build/trans_style.java:4308
+#: build/trans_style.java:4309 build/trans_style.java:4318
+#: build/trans_style.java:4327
 msgid "deprecated"
 msgstr "zastaralý"
@@ -20533,41 +22037,4 @@
 msgid "motorroad"
 msgstr ""
-
-#. color tertiary
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>30000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="unclassified"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="unsurfaced"/>
-#. color highway_track
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>20000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="residential"/>
-#. color street
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="living_street"/>
-#: build/trans_style.java:619 build/trans_style.java:635
-#: build/trans_style.java:651 build/trans_style.java:659
-msgid "street"
-msgstr "ulice"
 
 #. color street
@@ -22268,5 +23735,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3343
+#: build/trans_style.java:3294
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -22865,55 +24332,6 @@
 #.
 #. <rule>
-#. <condition k="information" v="bicyclemap"/>
-#. <icon annotate="true" src="misc/information/map_bicycle.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="information" v="hikingmap"/>
-#. <icon annotate="true" src="misc/information/map_hiking.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="information" v="pistemap"/>
-#. <icon annotate="true" src="misc/information/map_skiing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="information" v="citymap"/>
-#. <icon annotate="true" src="misc/information/map_city.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
 #. <condition k="information" v="board"/>
 #. <icon annotate="true" src="misc/information/board.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="information" v="nature"/>
-#. <icon annotate="true" src="misc/information/board_nature.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="information" v="history"/>
-#. <icon annotate="true" src="misc/information/board_history.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="information" v="wildlife"/>
-#. <icon annotate="true" src="misc/information/board_wildlife.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>40000</scale_max>
@@ -22927,5 +24345,5 @@
 #: build/trans_style.java:2925 build/trans_style.java:2933
 #: build/trans_style.java:2934 build/trans_style.java:2942
-#: build/trans_style.java:2958 build/trans_style.java:3029
+#: build/trans_style.java:2958 build/trans_style.java:2980
 msgid "tourism"
 msgstr "turistika"
@@ -22997,8 +24415,8 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
-#: build/trans_style.java:3039 build/trans_style.java:3047
-#: build/trans_style.java:3055 build/trans_style.java:3063
-#: build/trans_style.java:3071 build/trans_style.java:3079
-#: build/trans_style.java:3087 build/trans_style.java:3095
+#: build/trans_style.java:2990 build/trans_style.java:2998
+#: build/trans_style.java:3006 build/trans_style.java:3014
+#: build/trans_style.java:3022 build/trans_style.java:3030
+#: build/trans_style.java:3038 build/trans_style.java:3046
 msgid "historic"
 msgstr "historické"
@@ -23069,8 +24487,8 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_style.java:3104 build/trans_style.java:3112
-#: build/trans_style.java:3120 build/trans_style.java:3128
-#: build/trans_style.java:3176 build/trans_style.java:3184
-#: build/trans_style.java:3282 build/trans_style.java:3290
+#: build/trans_style.java:3055 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3127 build/trans_style.java:3135
+#: build/trans_style.java:3233 build/trans_style.java:3241
 msgid "green"
 msgstr "zeleň"
@@ -23084,5 +24502,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3136
+#: build/trans_style.java:3087
 msgid "quarry"
 msgstr "lom"
@@ -23096,5 +24514,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3144
+#: build/trans_style.java:3095
 msgid "landfill"
 msgstr "skládka"
@@ -23116,5 +24534,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3152 build/trans_style.java:3160
+#: build/trans_style.java:3103 build/trans_style.java:3111
 msgid "basin"
 msgstr "nádrže"
@@ -23128,5 +24546,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3168
+#: build/trans_style.java:3119
 msgid "forest"
 msgstr "les"
@@ -23140,5 +24558,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3151
 msgid "farmyard"
 msgstr "zemědělství"
@@ -23161,5 +24579,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3209 build/trans_style.java:3217
+#: build/trans_style.java:3160 build/trans_style.java:3168
 msgid "retail"
 msgstr "obchody"
@@ -23173,5 +24591,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3176
 msgid "industrial"
 msgstr "průmysl"
@@ -23185,5 +24603,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3233
+#: build/trans_style.java:3184
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -23197,5 +24615,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3241
+#: build/trans_style.java:3192
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -23209,5 +24627,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3249
+#: build/trans_style.java:3200
 msgid "railland"
 msgstr "železniční plochy"
@@ -23264,7 +24682,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3266 build/trans_style.java:3301
-#: build/trans_style.java:3309 build/trans_style.java:3317
-#: build/trans_style.java:3325 build/trans_style.java:3333
+#: build/trans_style.java:3217 build/trans_style.java:3252
+#: build/trans_style.java:3260 build/trans_style.java:3268
+#: build/trans_style.java:3276 build/trans_style.java:3284
 msgid "military"
 msgstr "vojenský"
@@ -23278,5 +24696,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3274
+#: build/trans_style.java:3225
 msgid "cemetery"
 msgstr "hřbitov"
@@ -23289,5 +24707,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3350
+#: build/trans_style.java:3301
 msgid "peak"
 msgstr "vrchol"
@@ -23302,5 +24720,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3310
 msgid "glacier"
 msgstr "ledovec"
@@ -23314,5 +24732,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3367
+#: build/trans_style.java:3318
 msgid "volcano"
 msgstr "sopka"
@@ -23367,8 +24785,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3384 build/trans_style.java:3400
-#: build/trans_style.java:3473 build/trans_style.java:3481
-#: build/trans_style.java:3489
+#: build/trans_style.java:3326 build/trans_style.java:3327
+#: build/trans_style.java:3335 build/trans_style.java:3351
+#: build/trans_style.java:3424 build/trans_style.java:3432
+#: build/trans_style.java:3440
 msgid "natural"
 msgstr "přírodní"
@@ -23382,5 +24800,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3392
+#: build/trans_style.java:3343
 msgid "scrub"
 msgstr "křoví"
@@ -23394,20 +24812,8 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3359
 msgid "heath"
 msgstr "vřesoviště"
 
-#. color heath
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="wood"/>
-#. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3416
-msgid "wood"
-msgstr "Prales"
-
 #. color water
 #. <scale_min>1</scale_min>
@@ -23418,5 +24824,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3457
+#: build/trans_style.java:3408
 msgid "mud"
 msgstr "bahno"
@@ -23430,5 +24836,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3465
+#: build/trans_style.java:3416
 msgid "beach"
 msgstr "pláž"
@@ -23506,8 +24912,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3505 build/trans_style.java:3513
-#: build/trans_style.java:3521 build/trans_style.java:3529
-#: build/trans_style.java:3537 build/trans_style.java:3545
-#: build/trans_style.java:3553 build/trans_style.java:3561
+#: build/trans_style.java:3456 build/trans_style.java:3464
+#: build/trans_style.java:3472 build/trans_style.java:3480
+#: build/trans_style.java:3488 build/trans_style.java:3496
+#: build/trans_style.java:3504 build/trans_style.java:3512
 msgid "route"
 msgstr "cesta"
@@ -23555,7 +24961,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3571 build/trans_style.java:3579
-#: build/trans_style.java:3587 build/trans_style.java:3595
-#: build/trans_style.java:3603
+#: build/trans_style.java:3522 build/trans_style.java:3530
+#: build/trans_style.java:3538 build/trans_style.java:3546
+#: build/trans_style.java:3554
 msgid "boundary"
 msgstr "hranice"
@@ -23697,10 +25103,19 @@
 #. <condition k="place" v="island"/>
 #. <icon annotate="true" src="place/island.png"/>
-#: build/trans_style.java:4043 build/trans_style.java:4051
-#: build/trans_style.java:4059 build/trans_style.java:4067
-#: build/trans_style.java:4075 build/trans_style.java:4083
-#: build/trans_style.java:4091 build/trans_style.java:4099
-#: build/trans_style.java:4107 build/trans_style.java:4115
-#: build/trans_style.java:4123 build/trans_style.java:4131
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="islet"/>
+#. <icon annotate="true" src="place/islet.png"/>
+#: 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
+#: build/trans_style.java:4042 build/trans_style.java:4050
+#: build/trans_style.java:4058 build/trans_style.java:4066
+#: build/trans_style.java:4074 build/trans_style.java:4082
+#: build/trans_style.java:4090
 msgid "place"
 msgstr "místo"
@@ -23748,6 +25163,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4248 build/trans_style.java:4255
-#: build/trans_style.java:4262 build/trans_style.java:4269
+#: build/trans_style.java:4207 build/trans_style.java:4214
+#: build/trans_style.java:4221 build/trans_style.java:4228
 msgid "address"
 msgstr "adresa"
@@ -24044,4 +25459,105 @@
 msgstr ""
 
+#~ 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."
+
+#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci."
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Interní chyba: nemohu ověřit podmínky pro žádné vrstvy. Reportuje jako "
+#~ "chybu."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Není otevřený žádný dokument, není co uložit."
+
+#~ msgid "Change {0} {1}"
+#~ msgstr "Změnit {0} {1}"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Smazat {1} {0}"
+
+#~ msgid "Remove relation member {0} {1}"
+#~ msgstr "Odstranit člena relace {0} {1}"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Nelze otevřít adresář s nastavením: {0}"
+
+#~ msgid "nodes"
+#~ msgstr "body"
+
+#~ msgid "ways"
+#~ msgstr "cesty"
+
+#~ msgid "relations"
+#~ msgstr "vazby"
+
+#~ msgid "changesets"
+#~ msgstr "sady změn"
+
+#~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
+#~ msgstr "<html>Selhalo nahrávání historie ze serveru. Detaily:<br>{0}</html>"
+
+#~ msgid ""
+#~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
+#~ msgstr ""
+#~ "Ve vrstvě ''{0}'' jsou neuložené změny. Chcete vrstvu skutečně smazat?"
+
+#~ msgid "Delete Layer"
+#~ msgstr "Smazat vrstvu"
+
+#~ msgid "Do you really want to delete layer ''{0}''?"
+#~ msgstr "Opravdu chcete smazat vrstvu ''{0}''?"
+
+#~ msgid "Delete all"
+#~ msgstr "Smazat vše"
+
+#~ msgid "Deleting layer {0} of {1}"
+#~ msgstr "Mazání vrstvy {0} z {1}"
+
+#~ msgid "Authors: {0}"
+#~ msgstr "Autoři: {0}"
+
+#~ msgid "Public"
+#~ msgstr "Veřejné"
+
+#~ msgid "Selected makes your trace public in openstreetmap.org"
+#~ msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org"
+
+#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
+#~ msgstr ""
+#~ "TOTO JE EXPERIMENTÁLNÍ. Uložte svoji práci a ověřte výsledek před "
+#~ "nahráním na server."
+
+#~ msgid "Continue anyway"
+#~ msgstr "Přesto pokračovat"
+
+#~ msgid "Edit Information Office"
+#~ msgstr "Editovat turistické informační centrum"
+
+#~ msgid "Map Type"
+#~ msgstr "Typ mapy"
+
+#~ msgid "map"
+#~ msgstr "mapa"
+
+#~ msgid "citymap"
+#~ msgstr "plán města"
+
+#~ msgid "hikingmap"
+#~ msgstr "turistická mapa"
+
+#~ msgid "bicyclemap"
+#~ msgstr "cyklistická mapa"
+
+#~ msgid "Board Type"
+#~ msgstr "Typ nástěnky"
+
+#~ msgid "board"
+#~ msgstr "obecná nástěnka"
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -24098,7 +25614,4 @@
 #~ msgstr "Vrátit zpět"
 
-#~ msgid "Not implemented yet."
-#~ msgstr "Zatím neimplementováno."
-
 #~ msgid "Add Selected"
 #~ msgstr "Přidat vybrané"
@@ -24142,7 +25655,4 @@
 #~ 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 ""
