Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 18975)
+++ applications/editors/josm/i18n/po/sk.po	(revision 19199)
@@ -4,10 +4,11 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:187
 msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-06 14:57+0100\n"
-"PO-Revision-Date: 2009-12-02 16:29+0000\n"
+"POT-Creation-Date: 2009-12-23 17:04+0100\n"
+"PO-Revision-Date: 2009-12-07 18:48+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,38 +17,38 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2009-12-06 13:18+0000\n"
+"X-Launchpad-Export-Date: 2009-12-23 15:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:207
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:145
+#: ../core/src/org/openstreetmap/josm/Main.java:208
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:157
 msgid "Creating main GUI"
 msgstr "Vytváram hlavné grafické rozhranie ( GUI )"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:217
+#: ../core/src/org/openstreetmap/josm/Main.java:218
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:439
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:483
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:185
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
 msgid "Help"
 msgstr "Nápoveda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:430
+#: ../core/src/org/openstreetmap/josm/Main.java:431
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
 msgstr "Ignorujem nesprávnu URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:431
-#: ../core/src/org/openstreetmap/josm/Main.java:451
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:119
+#: ../core/src/org/openstreetmap/josm/Main.java:432
+#: ../core/src/org/openstreetmap/josm/Main.java:452
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:60
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:138
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:125
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:126
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:92
@@ -59,21 +60,21 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:274
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:280
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:372
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:378
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:144
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:163
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:188
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:432
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:129
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:161
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:109
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:126
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:361
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:566
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:284
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:634
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:192
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:378
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:802
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:736
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:71
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
@@ -94,17 +95,8 @@
 msgstr "Upozornenie"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:450
+#: ../core/src/org/openstreetmap/josm/Main.java:451
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorujem poškodený súbor z URL: \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/Main.java:463
-#: ../core/src/org/openstreetmap/josm/Main.java:471
-#: ../core/src/org/openstreetmap/josm/Main.java:502
-#: ../core/src/org/openstreetmap/josm/Main.java:510
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
-#, java-format
-msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr "<html>Nemôžem čítať súbor ''{0}''.<br> Chyba je: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:464
@@ -112,8 +104,17 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:503
 #: ../core/src/org/openstreetmap/josm/Main.java:511
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:96
+#, java-format
+msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
+msgstr "<html>Nemôžem čítať súbor ''{0}''.<br> Chyba je: <br>{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:465
+#: ../core/src/org/openstreetmap/josm/Main.java:473
+#: ../core/src/org/openstreetmap/josm/Main.java:504
+#: ../core/src/org/openstreetmap/josm/Main.java:512
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:132
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:233
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:235
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -121,10 +122,10 @@
 #: ../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:406
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:417
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:97
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:113
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:455
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:466
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:489
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:502
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:99
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:115
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
@@ -136,9 +137,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java:91
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1075
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:153
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:177
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:186
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:252
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
@@ -147,6 +149,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:647
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:655
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
@@ -201,8 +203,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:102
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:146
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:646
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:648
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:158
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:725
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:727
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:68
 msgid "Java OpenStreetMap Editor"
@@ -270,5 +272,5 @@
 msgstr "O programe JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44
 #, java-format
 msgid ""
@@ -280,5 +282,5 @@
 "je: ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
 #, java-format
 msgid ""
@@ -289,5 +291,5 @@
 "užívateľa pre OSM užívateľ je pravdepodobne chybný. API báza URL je: ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:82
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
 #, java-format
 msgid ""
@@ -298,15 +300,20 @@
 "obrazovku s oknom prehliadača<br>a spôsobiť ukončenie po nejakej dobe."
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:281
 msgid "Continue"
 msgstr "Pokračovanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
+#, java-format
+msgid "Click to continue and to open {0} browsers"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -315,29 +322,30 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:250
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:298
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:358
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:151
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:349
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1161
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:119
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:548
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:112
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:160
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:220
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:292
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:311
 #: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:117
@@ -354,5 +362,10 @@
 msgstr "Zrušiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
+#, fuzzy
+msgid "Click to abort launching external browsers"
+msgstr "Neúspešné spustenie externého prehliadača pre pomoc"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
 msgid "Please select at least one already uploaded node, way, or relation."
 msgstr "Prosím vybrať aspoň jeden už nahraný bod, cestu, alebo reláciu."
@@ -368,5 +381,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge"
 msgstr "Zlúčiť"
@@ -386,15 +399,15 @@
 
 #. modal
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:164
 msgid "Add Node..."
 msgstr "Pridať bod..."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56
 msgid "Add a node by entering latitude and longitude."
 msgstr "Pridať bod zadaním zemepisnej šírky a dĺžky."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:58
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
@@ -410,22 +423,22 @@
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
 #: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
 msgid "Edit: {0}"
 msgstr "Úpravy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102
 msgid "Enter the coordinates for the new node."
 msgstr "Zadajte súradnice nového bodu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103
 msgid "Use decimal degrees."
 msgstr "Použite desatinné stupne."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:104
 msgid "Negative values denote Western/Southern hemisphere."
 msgstr "Záporné hodnoty znamenajú západnú, resp. južnú pologuľu."
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
 #: ../plugins/grid/src/grid/GridLayer.java:193
@@ -434,5 +447,5 @@
 msgstr "Zemepisná šírka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
 #: ../plugins/grid/src/grid/GridLayer.java:195
@@ -441,28 +454,29 @@
 msgstr "Zemepisná dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:224
 msgid "Please enter a valid latitude in the range -90..90"
 msgstr "Prosím vložte platnú zemepisnú šírku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:228
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:227
 msgid "Please enter a latitude in the range -90..90"
 msgstr "Prosím vložte zemepisnú šírku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:236
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:235
 msgid "Please enter a valid longitude in the range -180..180"
 msgstr "Prosím vložte platnú zemepisnú dĺžku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:238
 msgid "Please enter a longitude in the range -180..180"
 msgstr "Prosím vložte zemepisnú dĺžku v rozsahu -90..90"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:88
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1127
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -474,9 +488,9 @@
 msgstr "OK"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:276
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:275
 msgid "Close the dialog and create a new node"
 msgstr "Zatvorte dialóg a vytvorte nový bod"
 
-#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:289
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:288
 msgid "Close the dialog, don't create a new node"
 msgstr "Zatvorte dialóg, nevytvorte nový bod"
@@ -497,18 +511,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:74
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
@@ -520,5 +534,5 @@
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:72
+#: ../plugins/terracer/src/terracer/TerracerAction.java:55
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
 #, java-format
@@ -540,6 +554,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:49
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:52
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:89
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:91
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:188
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
@@ -586,5 +600,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
 msgid "conflict"
 msgstr "konflikt"
@@ -621,14 +635,15 @@
 msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360
 msgid "Close open changesets"
 msgstr "Zatvoriť otvorený súbor zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:35
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 msgid "Closes open changesets"
 msgstr "Zatvárajú sa otvorené súbory zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:41
@@ -638,21 +653,21 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 #, java-format
 msgid "File: {0}"
 msgstr "Súbor: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
 msgid "There are no open changesets"
 msgstr "Niesú tam otvorené súbory zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:59
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:66
 msgid "No open changesets"
 msgstr "Neotvorené súbory zmien"
 
-#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
 msgid "Downloading open changesets ..."
 msgstr "Sťahujem otvorené súbory zmien"
@@ -737,11 +752,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:282
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:856
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:953
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:259
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:832
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:958
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:579
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:201
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:200
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:91
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:133
@@ -819,16 +835,21 @@
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:99
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:937
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1027
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:56
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:83
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:127
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:143
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:76
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:120
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:136
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:47
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:49
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:95
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:112
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:117
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:81
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:589
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:44
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:60
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:184
+#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:21
+#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:33
+#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:46
 #, java-format
 msgid "Parameter ''{0}'' must not be null"
@@ -864,5 +885,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1333
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1337
 msgid "Duplicate"
 msgstr "Duplikovať"
@@ -905,10 +926,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:29
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:287
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:269
 msgid "Export to GPX..."
 msgstr "Exportovať do GPX..."
 
 #: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:286
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:268
 msgid "Export the data to GPX file."
 msgstr "Exportovať dáta do GPX súboru."
@@ -923,12 +944,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:264
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:266
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:93
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:91
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:38
 #: ../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/visitor/MergeSourceBuildingVisitor.java:44
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:913
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:915
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:869
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:910
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:912
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:32
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:34
@@ -953,8 +974,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:21
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:114
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:280
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:361
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:408
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:463
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:385
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:450
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:120
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:77
@@ -965,10 +986,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:119
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:223
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:235
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:247
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:345
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:228
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:240
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:252
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:350
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:81
@@ -981,17 +1002,17 @@
 #: ../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:59
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:61
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:55
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:60
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:112
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:134
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:296
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:328
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:366
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:133
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:307
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:339
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:53
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:75
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1028,22 +1049,27 @@
 msgstr "Zobraziť informácie o objekte o OSM bodoch, cestách, alebo reláciách."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
 msgid "Join overlapping Areas"
 msgstr "Spojiť prekrývajúce sa Plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:113
 msgid "Joins areas that overlap each other"
 msgstr "Spojiť plochy ktoré sa prekrývajú"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:125
+#, fuzzy
+msgid "Please select at least one closed way that should be joined."
+msgstr "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:131
 msgid "Only up to two areas can be joined at the moment."
 msgstr "Teraz môžu byť spojené iba dve plochy(areas)."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:138
 #, java-format
 msgid "\"{0}\" is not closed and therefore can't be joined."
 msgstr "\"{0}\" niesú uzavreté a preto nemôžu byť spojené.."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:151
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
 msgid ""
@@ -1056,38 +1082,34 @@
 "Ste si naozaj istý, že chcete pokračovať?"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:154
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
 msgid "Please abort if you are not sure"
 msgstr "Prosím prerušiť ak ste si nie istý"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
-msgid "Please select at least one closed way the should be joined."
-msgstr "Prosím vyberte aspoň jednu uzavretú cestu ktorá by mala byť spojená."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:180
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:168
 msgid "No intersection found. Nothing was changed."
 msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:190
 msgid "Added node on all intersections"
 msgstr "Pridať body na všetky priesečníky"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:229
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:217
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Vymazať cesty, ktoré nie sú  vnútornou časťou multipolygónu"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:222
 msgid "Fix relations"
 msgstr "Oprava relácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:239
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:227
 msgid "Joined self-overlapping area"
 msgstr "Spojená prekrývajúca sa plocha"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:228
 msgid "Joined overlapping areas"
 msgstr "Spojené prekrývajúce sa plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:232
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1097,33 +1119,33 @@
 "overte či to nepredstavuje nejakú chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:306
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:294
 msgid "Enter values for all conflicts."
 msgstr "Zadajte hodnoty pre všetky konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:295
 msgid "Solve Conflicts"
 msgstr "Riešenie konfliktov"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:322
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:310
 msgid "Fix tag conflicts"
 msgstr "Oprava konfliktu (rozporu) značiek"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:483
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:471
 msgid "Removed Element from Relations"
 msgstr "Odstránený Prvok z Relácií"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:607
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:595
 msgid "Join Areas: Remove Short Ways"
 msgstr "Spojiť plochy: Vymazať krátke cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:623
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:611
 msgid "Closed Way"
 msgstr "Uzavretá cesta"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:911
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:899
 msgid "Remove tags from inner ways"
 msgstr "Vymazať značky z vnútorných ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:943
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:931
 msgid "Join Areas Function"
 msgstr "Funkcie Spojenia Plôch (Join Areas Function)"
@@ -1287,5 +1309,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
 msgid "Cannot move objects outside of the world."
 msgstr "Nemôžem presúvať objekty mimo svet."
@@ -1365,28 +1387,28 @@
 msgstr "Sťahovanie dát"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:44
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:197
 msgid "Orthogonalize Shape"
 msgstr "Pravouhlý tvar"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
 msgid "Move nodes so all angles are 90 or 270 degree"
 msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:75
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:76
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:79
 msgid "Orthogonalize Shape / Undo"
 msgstr "Pravouhlý tvar / Obnovenie(Undo)"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Undo orthogonalization for certain nodes"
 msgstr "Obnovenie(Undo) pravouhlosti pre určené body"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99
 msgid "Orthogonalize / Undo"
 msgstr "Pravouhlosť / Obnovenie(Undo)"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
 msgid ""
 "Orthogonalize Shape / Undo\n"
@@ -1398,9 +1420,9 @@
 "pravouhlosť!"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108
 msgid "Undo Orthogonalize Shape"
 msgstr "Obnovenie(Undo) Pravouhlého tvaru"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:118
 msgid ""
 "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -1412,16 +1434,16 @@
 "chcete odstrániť toto upozornenie.<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:167
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:174
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
+msgid "Orthogonalize"
+msgstr "Pravouhlosť"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:203
 msgid "Usage"
 msgstr "Využitie"
 
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:175
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Vybrané prvky nemôžu byť zpravouhlené"
-
-#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:345
-msgid "Orthogonalize"
-msgstr "Pravouhlosť"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:31
@@ -1496,18 +1518,18 @@
 msgstr "Nemôžem premenovať súbor ''{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čiť smer ciest"
 
-#: ../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čiť smer všetkých zvolených ciest."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45
 msgid "Please select at least one way."
 msgstr "Zvoľte minimálne jednu cestu."
 
-#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75
 msgid "Reverse ways"
 msgstr "Otočiť smer ciest"
@@ -1516,10 +1538,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:29
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:62
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:239
 msgid "Save"
 msgstr "Uložiť"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:238
 msgid "Save the current data."
 msgstr "Uložiť aktuálne dáta."
@@ -1576,10 +1598,10 @@
 #: ../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:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:254
 msgid "Save As..."
 msgstr "Uložiť ako..."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:253
 msgid "Save the current data to a new file."
 msgstr "Uložiť aktuálne údaje do nového súboru."
@@ -1624,6 +1646,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:121
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1052
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:938
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1656,5 +1677,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:137
-#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:67
+#: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:66
 #, java-format
 msgid "Simplify Way (remove {0} node)"
@@ -1725,5 +1746,5 @@
 "cesty.)"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:371
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:425
 msgid ""
 "<html>A role based relation membership was copied to all new ways.<br>You "
@@ -1734,5 +1755,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:377
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:431
 msgid ""
 "<html>A relation membership was copied to all new ways.<br>You should verify "
@@ -1742,5 +1763,5 @@
 "toto overiť a  opraviť ak je to nutné.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:383
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:437
 #, java-format
 msgid "Split way {0} into {1} parts"
@@ -1774,34 +1795,34 @@
 msgstr "Tento bod nie je prilepený k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:102
 msgid "None of these nodes are glued to anything else."
 msgstr "Žiaden z týchto bodov nie je prilepený k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
 msgid "None of this way's nodes are glued to anything else."
 msgstr "Žiadna z týchto ciest nie je prilepená k ničomu inému."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:114
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:113
 msgid "The current selection cannot be used for unglueing."
 msgstr "Tento výber sa nedá použiť pre oddelenie bodov"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
 msgid "Select either:"
 msgstr "Vyberte buď:"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:116
 msgid "* One tagged node, or"
 msgstr "* Jeden označený bod, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
 msgid "* One node that is used by more than one way, or"
 msgstr "* Jeden bod používaný viac než jednou cestou, alebo"
 
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr ""
+"* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo"
+
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
-msgid "* One node that is used by more than one way and one of those ways, or"
-msgstr ""
-"* Jeden bod používaný viac než jednou cestou a jednu z týchto ciest, alebo"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way that has one or more nodes that are used by more than one way, or"
@@ -1810,5 +1831,5 @@
 "ceste, alebo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
 msgid ""
 "* One way and one or more of its nodes that are used by more than one way."
@@ -1817,5 +1838,5 @@
 "ceste."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
@@ -1828,9 +1849,9 @@
 "svoje vlastné kópie a všetky bodybudú vybraté."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:165
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:164
 msgid "Unglued Node"
 msgstr "Nepripojený bod (Unglued Node)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:368
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:366
 #, java-format
 msgid "Dupe into {0} nodes"
@@ -1838,5 +1859,5 @@
 
 #. only one changeCommand for a way, else garbage will happen
-#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:392
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:390
 #, java-format
 msgid "Dupe {0} nodes into {1} nodes"
@@ -1871,10 +1892,10 @@
 msgstr "Odznačiť všetko (Escape)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27
 msgid "Update data"
 msgstr "Aktualizácia dát"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
 msgid "Updates the objects in the active data layer from the server."
 msgstr "Aktualizácia objektov v aktívnej dátovej vrstve zo servera."
@@ -1882,53 +1903,49 @@
 #. bounds defined? => use the bbox downloader
 #.
-#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:981
 msgid "Download data"
 msgstr "Sťahujem dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:80
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
 msgid "No current dataset found"
 msgstr "Nájdená neaktuálna dátová sada"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
 #, java-format
 msgid "Didn''t find an object with id {0} in the current dataset"
 msgstr "Nemôže byť nájdený objekt s id {0} v aktuálnej dátovej sade"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85
 msgid "Update selection"
 msgstr "Aktualizovať výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
 msgstr "Aktualizovať aktuálne vybraté objekty zo servera (znovu nahrať dáta)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
 msgid "Update Selection"
 msgstr "Aktualizácia výberu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:126
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "There are no selected objects to update."
 msgstr "Pre aktualizáciu neboli vybrané žiadne objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:127
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
 msgid "Selection empty"
 msgstr "Výber je prázdny"
 
-#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:153
-msgid "Update objects"
-msgstr "Aktualizovať objekty"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:120
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Upload data"
 msgstr "Nahrať dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85
 msgid "Upload all changes in the active data layer to the OSM server"
 msgstr "Nahrať všetky zmeny v aktívnej dátovej vrstve na OSM server"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
 #, java-format
 msgid ""
@@ -1939,5 +1956,5 @@
 "vyriešte.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:108
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:125
@@ -1945,154 +1962,7 @@
 msgstr "Žiadne zmeny pre uloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:187
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:160
 msgid "Nothing to upload. Get some data first."
 msgstr "Nie je nič k nahratiu. Najskôr musíte mať nejaké dáta."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:232
-#, java-format
-msgid "Synchronize node {0} only"
-msgstr "Synchronizovať iba {0} bod"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:233
-#, java-format
-msgid "Synchronize way {0} only"
-msgstr "Synchronizovať iba {0} cestu"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:234
-#, java-format
-msgid "Synchronize relation {0} only"
-msgstr "Synchronizovať iba {0} reláciu"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:244
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:292
-msgid "Synchronize entire dataset"
-msgstr "Synchronizovať celú dátovú sadu"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:256
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>Aktualizácia <strong>neúspešná</strong> pretože server ná novú verziu "
-"jednu z<br>vaších bodov, ciest, alebo relácií.<br>Konflikt je zapríčinený "
-"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu {2},"
-"vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu iba "
-"sporných  pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu celej "
-"lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
-"zrušenie a pokračovanie v editácii.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:270
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:314
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
-msgid "Conflicts detected"
-msgstr "Objavené konflikty"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:304
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>Nahrávanie <strong>neúspešné</strong> pretože server má novú verziu "
-"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click <strong>{0}</"
-"strong>pre synchronizáciu celej lokálnej dátovej sady so serverom.<br>Click "
-"<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:332
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because you''ve been "
-"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset.</html>"
-msgstr ""
-"<html>Nahrávanie <strong>neúspešné</strong> pretože ste použili<br>zmenový "
-"súbor {0} ktorý už bol zavretý v {1}.<br>Prosím nahrať znova s novým, alebo "
-"existujúcim zmenovým súborom.</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:340
-msgid "Changeset closed"
-msgstr "Zmenový súbor zavretý"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:352
-msgid "Prepare conflict resolution"
-msgstr "Pripravujem rozhodnutie konfliktov"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:354
-#, java-format
-msgid "Click to download all parent ways for node {0}"
-msgstr "Kliknutím stiahnete všetky rodičovské cesty pre body {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
-msgid "Click to cancel and to resume editing the map"
-msgstr "Kliknutím zrušíte a pokračujete v editovaní mapy"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
-#, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because you tried to delete node {0} "
-"which is still in use in way {1}.<br><br>Click <strong>{2}</strong> to "
-"download all parent ways of node {0}.<br>If necessary JOSM will create "
-"conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
-msgstr ""
-"<html>Nahrávanie <strong>neúspešné</strong> pretože sa snažíte zmazať bod "
-"{0} ktorý je stále použitý v ceste {1}.<br><br>Klik <strong>{2}</strong> pre "
-"stiahnutie všetky rodičovské cesty pre bod {0}.<br>Ak nevyhnutne JOSM bude "
-"chcieť vytvoriť konflikty ktoré môžete rozhodnúť v the Conflict Resolution "
-"Dialog.</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
-msgid "Node still in use"
-msgstr "Bod je stále v užívaní"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:413
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:430
-#, java-format
-msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
-"Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:525
-msgid "Updating primitive"
-msgstr "Aktualizácia pôvodných"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:580
-#, java-format
-msgid "Uploading data for layer ''{0}''"
-msgstr "Náhrávanie dát na server z vrstvy ''{0}''"
-
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:612
-#, java-format
-msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
-msgstr ""
-"Upozornenie: objekt ''{0}'' je už na servery zmazaný. Vynechávam tento "
-"objekt a opakujem nahrávanie."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:613
-#, java-format
-msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr "objekt ''{0}'' je už zmazaný. Vynechávam objekt v nahrávaní."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:630
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Nahrávam {0} objekty(ov) ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:650
-#, java-format
-msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr ""
-"Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:44
@@ -2227,9 +2097,9 @@
 msgstr "Stiahnuté GPX dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:81
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82
 msgid "Downloading data"
 msgstr "Sťahujem dáta"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:93
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94
 #, java-format
 msgid ""
@@ -2237,5 +2107,5 @@
 msgstr "Ignorujem výnimky pretože sťahovanie bolo zrušené. Výnimka bola: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:140
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:144
 msgid "No data found in this area."
 msgstr "V tejto oblasti sa nenachádzajú žiadne dáta."
@@ -2313,7 +2183,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:30
@@ -2330,58 +2200,52 @@
 "nemaže body. CTRL: zmaže referenčné objekty."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../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:99
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
 msgid "Draw"
 msgstr "Kresliť"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 msgid "Draw nodes"
 msgstr "Kresliť body"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
 msgid "Mode: Draw Focus"
 msgstr "Režim: Kresliť Fokus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:213
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:107
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-msgid "selected"
-msgstr "zvolené"
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:360
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
 msgid "Cannot add a node outside of the world."
 msgstr "Nemôžem pridať body ležiace mimo svet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:535
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node"
 msgstr "Pridať bod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:537
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
 msgid "Add node into way"
 msgstr "Pridať bod do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Connect existing way to node"
 msgstr "Pripojiť existujúcu cestu do bodu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:547
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Pridať nový bod do existujúcej cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:549
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
 msgid "Add node into way and connect"
 msgstr "Pridať bod do cesty a spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:934
 msgid "Create new node."
 msgstr "Vytvoriť nový bod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
 msgid "Select node under cursor."
 msgstr "Zvoliť bod pod kurzorom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
 #, java-format
 msgid "Insert new node into way."
@@ -2391,14 +2255,14 @@
 msgstr[2] "Vložiť nový bod do {0} ciest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Start new way from last node."
 msgstr "Začiatok novej cesty z posledného bodu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Continue way from last node."
 msgstr "Pokračovanie cesty z posledného bodu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:969
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:980
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:976
 msgid "Finish drawing."
 msgstr "Koniec kreslenia."
@@ -2442,18 +2306,19 @@
 "záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode."
 
+#: ../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/actions/mapmode/SelectAction.java:113
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:349
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:147
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid "Select"
 msgstr "Výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 msgid "Select, move and rotate objects"
 msgstr "Zvoliť, posunúť a otáčať objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:213
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2463,17 +2328,17 @@
 msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
 msgid "Move elements"
 msgstr "Posunúť elementy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 msgid "Move them"
 msgstr "Posunúť ich(them)"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:471
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 msgid "Undo move"
 msgstr "Krok späť posun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:473
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 #, java-format
 msgid ""
@@ -2485,13 +2350,13 @@
 "Skutočne ich chcete presunúť?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:477
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:476
 msgid "Always move and don't show dialog again"
 msgstr "Vždy posúvať a nezobrazovať znovu dialóg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2499,9 +2364,9 @@
 "Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
 msgid "Release the mouse button to stop rotating."
 msgstr "Pustite tlačítko myši k zastaveniu otáčania"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:552
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2513,5 +2378,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:418
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:416
 msgid "Zoom"
 msgstr "Zväčšenie"
@@ -2535,5 +2400,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:47
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Search for objects."
 msgstr "Vyhľadávať objekty"
@@ -2627,7 +2492,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
-#, fuzzy
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr "<b>user:</b>... - všetky objekty nahraté užívateľom"
+msgstr ""
+"<b>užívateľ:anonymný</b> - všetky objekty zmenené anonymnými užívateľmi"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
@@ -2636,8 +2501,20 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
-msgid "<b>nodes:</b>... - object with given number of nodes"
+#, fuzzy
+msgid ""
+"<b>changeset:</b>... - object with given changeset id (0 objects without "
+"assigned changeset)"
 msgstr "<b>nodes:</b>... - objekt s pridanými číslami bodov"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+#, fuzzy
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>značky:</b>... - objekt s uvedeným číslom kvôli značkám (značky:spočítať "
+"alebo značky:min-max)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid ""
 "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
@@ -2647,26 +2524,32 @@
 "alebo značky:min-max)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
+msgid ""
+"<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - všetky zmenené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - všetky vybraté objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - všetky nekompletné objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - všetky neoznačené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>dieťa <i>výraz</i></b> - všetky deti objektov vyhovujúcich výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2674,19 +2557,19 @@
 "<b>rodič <i>výraz</i></b> - všetci rodičia objektov vyhovujúcich výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Použite <b>|</b> alebo <b>OR</b> pri kombinácii s logickým \"alebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Použite <b>\"</b> ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Použite <b>(</b> a <b>)</b> k zoskupeniu výrazov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
@@ -2694,55 +2577,55 @@
 msgstr "Filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:140
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "Submit filter"
 msgstr "Predložiť filter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:150
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:152
 msgid "Start Search"
 msgstr "Začať vyhľadávanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:270
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Neboli nájdené záznamy pre \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:272
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:274
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nič nebolo odstránené z výberu hľadaním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:276
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:278
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
 msgstr "Nič sa nenašlo vo výbere vyhľadávania pre ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:288
 #, java-format
 msgid "Found {0} matches"
 msgstr "Najdených {0} zodpovedajúcich výrazov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:314
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:316
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:315
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:317
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:32
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
 #, java-format
 msgid ""
@@ -2755,5 +2638,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:191
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:218
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2761,10 +2644,10 @@
 "použitia: kľúč=hodnota"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:233
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:260
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
 msgstr "Syntaktická chyba vzoru: Vzor {0} v {1} je nedovolený!"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:379
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:406
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
@@ -2772,26 +2655,29 @@
 "Neznámy pôvodný typ: {0}. Povolené hodnoty sú, body, cesty, alebo relácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:570
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:594
 #, java-format
 msgid "Unexpected token: {0}"
 msgstr "Neočakávaná značka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:590
-msgid "Missing arguments for or."
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:605
+#, fuzzy
+msgid "Missing parameter for OR"
 msgstr "Chýbajúci argument pre \"alebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:600
-msgid "Missing argument for not."
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:627
+#, fuzzy
+msgid "Missing right parent"
 msgstr "Chýbajúci argument pre \"NOT\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
-msgid "Expected closing parenthesis."
-msgstr "Očakávam uzatváraciu zátvorku."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:672
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:630
+#, fuzzy
+msgid "Missing operator for NOT"
+msgstr "Chýbajúci argument pre \"alebo\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:681
 msgid "Wrong number of parameters for tags operator."
 msgstr "Zlý počet údajov(parametrov) pre operátor značiek."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:674
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:683
 #, java-format
 msgid ""
@@ -2802,9 +2688,9 @@
 "zo značiek alebo rozsahu, napríklad značky:1 alebo značky:2-5"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:684
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693
 msgid "Wrong number of parameters for nodes operator."
 msgstr "Zlé číslo parametrov pre operátor bodov."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:686
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:695
 #, java-format
 msgid ""
@@ -2815,7 +2701,12 @@
 "alebo rozsah bodov, napr. body:10-20"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:693
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:702
 #, java-format
 msgid "Incorrect value of id operator: {0}. Number is expected."
+msgstr "Nesprávna hodnota pre id operátor: {0}.  Číslo je očakávané."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:708
+#, fuzzy, java-format
+msgid "Incorrect value of changeset operator: {0}. Number is expected."
 msgstr "Nesprávna hodnota pre id operátor: {0}.  Číslo je očakávané."
 
@@ -2849,43 +2740,33 @@
 msgstr "Chyba počas komunikácie so serverom"
 
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:50
-#, java-format
-msgid ""
-"Current number of changes exceeds the max. number of changes, current is "
-"{0}, max is {1}"
-msgstr ""
-"Aktuálne množstvo zmien prekročilo maximálne množstvo zmien, aktuálne je "
-"{0}, maximálne je {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:54
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:104
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
+#, java-format
+msgid ""
+"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr ""
+"Varovanie: automaticky skracujem hodnotu tagu ''{0}'' pri vymazaných "
+"objektoch {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67
+#, java-format
+msgid ""
+"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
+"length {2}. Values length is {3}."
+msgstr ""
+"Dĺžka s hodnotou pre tag ''{0}'' pri objekte {1} prekonala max. povolenú "
+"dĺžku {2}. Dĺžka hodnoty je {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
+msgid "Precondition Violation"
+msgstr "Predpoklad Porušenia"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:82
+#, java-format
+msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
+msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
 msgid "API Capabilities Violation"
 msgstr "API Capabilities Violation"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:75
-#, fuzzy, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr ""
-"Varovanie: automatické skracovanie hodnôt a značiek ''{0}'' pri vymazávaní "
-"pôvodných {1}"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:84
-#, fuzzy, java-format
-msgid ""
-"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"Dĺžka hodnoty pre značku ''{0}'' pri pôvodnej {1} prekročila max. povolenú "
-"dĺžku {2}. Dĺžka hodnôt je {3}."
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
-msgid "Precondition Violation"
-msgstr "Predpoklad Porušenia"
-
-#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:99
-#, java-format
-msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr "{0} bodov v ceste {1} prekročilo max. povolené množstvo bodov {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
@@ -3001,5 +2882,5 @@
 msgstr "Nastavené {0}={1} pre {2} {3}"
 
-#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:70
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:71
 #, java-format
 msgid "Change relation member role for {0} {1}"
@@ -3016,5 +2897,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
 msgid "Double conflict"
 msgstr "Dvojitý konflikt"
@@ -3125,4 +3006,19 @@
 msgstr "Vyriešte konflikty v zmazaných (state) v {0}"
 
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41
+#, java-format
+msgid "Set the 'modified' flag for node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
+#, java-format
+msgid "Set the 'modified' flag for way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
+#, java-format
+msgid "Set the 'modified' flag for relation {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
 #, java-format
@@ -3238,5 +3134,5 @@
 msgstr "Použiť?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:173
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:177
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3320,15 +3216,15 @@
 msgstr "Parameter ''{0}'' > 0.0 očakávaný, dostal som {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:289
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:343
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
 msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:393
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:442
 #, java-format
 msgid "Malformed config file at lines {0}"
 msgstr "Poškodený konfiguračný súbor pri linke {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:451
 #, java-format
 msgid ""
@@ -3339,5 +3235,5 @@
 "nie je adresár."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:405
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:454
 #, java-format
 msgid ""
@@ -3348,5 +3244,5 @@
 "nie je adresár.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:413
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
 #, java-format
 msgid ""
@@ -3357,5 +3253,5 @@
 "chýbajúceho adresára preferencií: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:416
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:465
 #, java-format
 msgid ""
@@ -3366,5 +3262,5 @@
 "chýbajúceho adresára preferencií: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:476
 #, java-format
 msgid ""
@@ -3374,5 +3270,5 @@
 "súboru preferencií."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:431
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:480
 #, java-format
 msgid ""
@@ -3383,5 +3279,5 @@
 "súborom preferencií."
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:439
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488
 #, java-format
 msgid ""
@@ -3392,5 +3288,5 @@
 "preferencií do východzieho: {0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:501
 #, java-format
 msgid ""
@@ -3401,5 +3297,5 @@
 "súboru  <br>{0}<br> a vytváranie nového východzieho súboru.</html>"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:462
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:511
 #, java-format
 msgid ""
@@ -3410,10 +3306,10 @@
 "preferencií do východzích: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:488
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:537
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
 msgstr "Chyba: Neočakávaný riadok ''{0}'' v súbore záložiek ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/Preferences.java:498
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:547
 #, java-format
 msgid ""
@@ -3423,24 +3319,24 @@
 "záložiek ''{2}''"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:90
 #, java-format
 msgid "Preferences stored on {0}"
 msgstr "Predvoľby uložené na {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:96
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:98
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
 msgstr "Nemôžem nahrať predvoľby. Dôvod: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:112
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:114
 msgid "Could not load preferences from server."
 msgstr "Nemôžem nahrať predvoľby zo servera."
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:195
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:197
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr "Chyba: Neočakávaný riadok ''{0}'' v obsahu záložiek zo servera"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:206
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:208
 #, java-format
 msgid ""
@@ -3451,5 +3347,5 @@
 "záložiek zo servera"
 
-#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:223
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:225
 #, java-format
 msgid ""
@@ -3482,5 +3378,5 @@
 msgstr "Varovanie: opravný súbor ''/REVISION'' chýba."
 
-#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:77
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:75
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
@@ -3502,31 +3398,24 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:76
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:80
 msgid "S"
 msgstr "J"
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:77
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:81
 msgid "N"
 msgstr "S"
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:94
 msgid "W"
 msgstr "Z"
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:91
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:95
 msgid "E"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:103
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200
-#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
-#, java-format
-msgid "Changeset {0}"
-msgstr "Súbor zmien {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:184
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:195
 #, java-format
 msgid ""
@@ -3534,5 +3423,5 @@
 msgstr "Neschopnosť pridať pôvodné {0} do dátovej sady, pretože sú už zahrnuté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:623
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:637
 #, java-format
 msgid ""
@@ -3546,26 +3435,26 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:146
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:234
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:214
 #, java-format
 msgid "Missing merge target for way with id {0}"
 msgstr "Chýbajúci cieľ pre spojenie s cestou s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:168
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:226
 #, java-format
 msgid "Missing merge target for node with id {0}"
 msgstr "Chýba zlúčujúci ciel pre bod s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:205
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
 #, java-format
 msgid "Missing merge target for object with id {0}"
 msgstr "Chýba zlúčujúci ciel pre objekt s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:261
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241
 #, java-format
 msgid "Missing merge target for relation with id {0}"
 msgstr "Chýba zlúčujúci ciel pre reláciu s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:266
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
@@ -3574,5 +3463,5 @@
 #. should not happen
 #.
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:298
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:278
 #, java-format
 msgid ""
@@ -3587,5 +3476,5 @@
 #. translators notes must be in front
 #. column header: enable filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:142
 msgctxt "filter"
 msgid "E"
@@ -3593,25 +3482,25 @@
 
 #. column header: hide filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
 msgid "H"
 msgstr "H"
 
 #. column header: filter text
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
 msgid "Text"
 msgstr "Text"
 
 #. column header: apply filter for children
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
 msgid "C"
 msgstr "C"
 
 #. column header: inverted filter
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
 msgid "I"
 msgstr "I"
 
 #. column header: filter mode
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:148
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
 msgid "M"
 msgstr "M"
@@ -3619,43 +3508,55 @@
 #. translators notes must be in front
 #. filter mode: replace
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:206
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
 msgid "R"
 msgstr "R"
 
 #. filter mode: add
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:207
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
 msgid "A"
 msgstr "A"
 
 #. filter mode: remove
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:208
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
 msgid "D"
 msgstr "D"
 
 #. filter mode: in selection
-#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:209
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
 msgid "F"
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:252
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:265
 #, java-format
 msgid "Expected ID >= 0. Got {0}."
 msgstr "očekávané id >= 0. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:384
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:402
 msgid "A primitive with ID = 0 can't be invisible."
 msgstr "pôvodné s id=0 nemôžu byť neviditeľné"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:441
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:459
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 očakávané. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:443
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:461
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "verzia > 0 očakávaná. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:939
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:654
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#, java-format
+msgid ""
+"Can''t assign a changesetId > 0 to a new primitive. Value of changesetId is "
+"{0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1029
 msgid ""
 "Can''t merge because either of the participating primitives is new and the "
@@ -3665,5 +3566,5 @@
 "je"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:941
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1031
 #, java-format
 msgid ""
@@ -3693,10 +3594,6 @@
 "viacnásobnými hodnotami"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/User.java:59
-msgid "User with the same uid but different name found"
-msgstr "Vytvorený užívateľ s rovnakým uid, ale rozdielnym menom"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:283
-#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:305
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
+#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
@@ -3704,7 +3601,7 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:54
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:81
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:85
-#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:125
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:74
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:78
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:118
 #, java-format
 msgid "Parameter ''{0}'' > 0 expected, got {1}"
@@ -3719,5 +3616,5 @@
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:73
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:86
 #, java-format
 msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
@@ -3735,146 +3632,138 @@
 msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:225
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:232
 msgid "Area style way is not closed."
 msgstr "Cesta označená ako plocha nie je uzavretá."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:456
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:426
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
 msgstr "Cesta v multipolygóne ''{0}'' nie je uzatvorená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:535
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:863
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:504
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:819
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:546
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:871
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:515
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:827
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:551
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:520
 msgid "More than one \"from\" way found."
 msgstr "Najdená viac než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:557
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:526
 msgid "More than one \"to\" way found."
 msgstr "Najdené viac cieľových \"to\" ciest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:563
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:577
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:532
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:546
 msgid "More than one \"via\" found."
 msgstr "Viac ako jedna \"via\" najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:568
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:537
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:551
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznáma funkcia ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:585
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:554
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámy typ člena pre ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:591
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:560
 msgid "No \"from\" way found."
 msgstr "Nenajdená cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:564
 msgid "No \"to\" way found."
 msgstr "Nenajdená cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:568
 msgid "No \"via\" node or way found."
 msgstr "Nie je \"via\" bod alebo cesta najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:608
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:577
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:581
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:609
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:613
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:738
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:707
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Štýl pre obmedzenie {0} nenajdený."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:832
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:788
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:844
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:800
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Vnútorná(inner) cesta ''{0}'' je vonku."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:879
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:835
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:891
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:847
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:935
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:891
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:995
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:951
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1025
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:981
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1320
-msgid "untagged"
-msgstr "neoznačený"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1321
-msgid "text"
-msgstr "text"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1322
-msgid "areatext"
-msgstr "oblasť textu"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249
 #, java-format
 msgid "Error: {0}"
 msgstr "Chyba: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1475
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:1249
 #, java-format
 msgid "Warning: {0}"
 msgstr "Varovanie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
 msgid "inactive"
 msgstr "neaktívny"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
+msgid "selected"
+msgstr "zvolené"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3884,6 +3773,6 @@
 msgstr[2] "bodov"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3893,7 +3782,8 @@
 msgstr[2] "ciest"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100
+#. dark blue
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3903,21 +3793,37 @@
 msgstr[2] "vzťahov (relations)"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101
+#. teal
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18
 msgid "untagged way"
 msgstr "neoznačená cesta"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
+#. dark green
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
 msgid "incomplete way"
 msgstr "nekompletná cesta"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:103
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+#. darker blue
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
 msgid "background"
 msgstr "pozadie"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:104
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21
 msgid "highlight"
 msgstr "označiť (highlight)"
+
+#. lighteal
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
+msgid "untagged"
+msgstr "neoznačený"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:24
+msgid "text"
+msgstr "text"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25
+msgid "areatext"
+msgstr "oblasť textu"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
@@ -4061,5 +3967,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "railway"
 msgstr "železnica"
@@ -4075,7 +3981,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:329
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:257
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} node"
@@ -4093,4 +3999,10 @@
 msgstr[2] "{0} členy"
 
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:200
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
+#, java-format
+msgid "Changeset {0}"
+msgstr "Súbor zmien {0}"
+
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:74
 msgid "Precondition violation"
@@ -4122,6 +4034,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
 msgid "Conflict"
 msgstr "Konflikt"
@@ -4135,7 +4047,7 @@
 msgstr "Objekt je vymazaný"
 
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:184
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
@@ -4221,74 +4133,74 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:171
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Meno používateľa"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:174
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "usage"
 msgstr "použitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
 msgid "Show this help"
 msgstr "Zobrazí túto nápovedu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
 msgid "Standard unix geometry argument"
 msgstr "Štandardný unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:108
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:120
 msgid "Download the bounding box"
 msgstr "Stiahnuť ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:109
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stiahnite polohu na url (s šírka=x&dĺžka=y&zväčšenie=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:110
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:122
 msgid "Open file (as raw gps, if .gpx)"
 msgstr "Otvoriť súbor (as raw gps, if .gpx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:111
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:123
 msgid "Download the bounding box as raw gps"
 msgstr "Stiahnuť ohraničenú oblasť ako \"raw\" GPS dáta"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:112
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:124
 msgid "Select with the given search"
 msgstr "Výber s určeným hľadaním"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:113
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:125
 msgid "Launch in maximized mode"
 msgstr "Spustiť v maximalizovanom režime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:126
 msgid "Reset the preferences to default"
 msgstr "Nastaviť východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:127
 msgid "Set the language."
 msgstr "Nastaviť jazyk."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
 msgid "options provided as Java system properties"
 msgstr "možnosti poskytnutia ako Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/JOSM/ZLOŽKE/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:117
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:129
 msgid "Change the folder for all user settings"
 msgstr "Zmena adresára  pre všetký nastavenia užívateľa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:118
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4300,9 +4212,9 @@
 "      Java nastavenie využitia na maximálnu mieru pridelenej pamäti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:121
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:133
 msgid "examples"
 msgstr "príklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:128
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:140
 msgid ""
 "Parameters are read in the order they are specified, so make sure you load\n"
@@ -4313,36 +4225,36 @@
 "nejaké dáta predtým--výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:130
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 msgstr "Namiesto --download=<bbox> môžete zadať osm://<bbox>\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:136
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:148
 msgid "Activating updated plugins"
 msgstr "Aktivujem aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:139
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:151
 msgid "Loading early plugins"
 msgstr "Načítavam skoršie pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:142
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:154
 msgid "Setting defaults"
 msgstr "Nastavujem východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:149
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:161
 msgid "Loading plugins"
 msgstr "Načítavam pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:187
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:199
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
 msgstr "Nastavenie predvoľby {0} bolo vymazané, pretože nebola dlho používaná."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:161
 msgid "File"
 msgstr "Súbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:901
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:877
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4357,22 +4269,22 @@
 msgstr "Upraviť"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:163
 msgid "View"
 msgstr "Zobraziť"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:164
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:24
 msgid "Tools"
 msgstr "Nástroje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Predvoľby"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:192
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:190
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
 #, java-format
@@ -4380,5 +4292,5 @@
 msgstr "Menu: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:291
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
 msgid "Audio"
 msgstr "Zvuk"
@@ -4459,13 +4371,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:427
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:121
 msgid "User:"
 msgstr "Používateľ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:312
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:328
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:374
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:391
 msgid "Layer not in list."
 msgstr "vrstva nie je v zozname"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:528
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:623
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4498,5 +4411,5 @@
 msgstr "Prebieha inicializácia"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150
 msgid ""
 "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
@@ -4506,6 +4419,6 @@
 "relácie</strong>.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:127
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154
 #, java-format
 msgid ""
@@ -4516,5 +4429,5 @@
 "relácií</strong>.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
 #, java-format
 msgid ""
@@ -4525,5 +4438,5 @@
 "{1} relácií</strong>.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165
 #, java-format
 msgid "Deleting {0} object"
@@ -4533,25 +4446,25 @@
 msgstr[2] "Vymazávam {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:142
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167
 msgid "Delete objects"
 msgstr "Zmazať objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
 msgid "To delete"
 msgstr "Na zmazanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:294
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319
 msgid "From Relation"
 msgstr "Z relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:303
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
 msgid "Pos."
 msgstr "Pos."
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:311
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:26
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:42
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:16
 #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
@@ -4559,9 +4472,9 @@
 msgstr "Úloha"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:327
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352
 msgid "Click to close the dialog and remove the object from the relations"
 msgstr "Kliknutie zavrie dialóg a odstráni objekt z relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365
 msgid "Click to close the dialog and to abort deleting the objects"
 msgstr "Kliknutie zavrie dialóg a zruší vymazanie objektov"
@@ -4593,11 +4506,11 @@
 msgstr "funkcia {0} sa nenachádza v porovnávenej dvojici {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:100
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
 msgid "Properties"
 msgstr "Vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:163
+#: ../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:233
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
@@ -4606,6 +4519,6 @@
 msgstr "Značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:241
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:242
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
@@ -4613,6 +4526,6 @@
 msgstr "Body"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:236
+#: ../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:269
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
@@ -4620,23 +4533,23 @@
 msgstr "Členovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:165
 msgid "No pending tag conflicts to be resolved"
 msgstr "Nevyriešený konflikt značiek musí byť vyriešený"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:167
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
 #, java-format
 msgid "Tags({0} conflicts)"
 msgstr "Značky({0} konfliktov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:168
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
 #, java-format
 msgid "{0} pending tag conflicts to be resolved"
 msgstr "{0} nevyriešený konflikt značiek musí byť vyriešený"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
 msgid "Nodes(resolved)"
 msgstr "Body(vyriešené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
 msgid ""
 "Merged node list frozen. No pending conflicts in the node list of this way"
@@ -4645,17 +4558,17 @@
 "tejto ceste."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:179
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
 msgid "Nodes(with conflicts)"
 msgstr "Body(v konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:180
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:181
 msgid "Pending conflicts in the node list of this way"
 msgstr "Nevyriešené konflikty v zozname bodov v tejto ceste"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
 msgid "Members(resolved)"
 msgstr "Členy(vyriešené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
 msgid ""
 "Merged member list frozen. No pending conflicts in the member list of this "
@@ -4665,21 +4578,21 @@
 "tejto relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
 msgid "Members(with conflicts)"
 msgstr "Členy(v konflikte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
 msgid "Pending conflicts in the member list of this relation"
 msgstr "Nevyriešené konflikty v zozname členov v tejto relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
 msgid "No pending property conflicts"
 msgstr "Nevyriešený konflikt vo vlastnostiech"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
 msgid "Properties(with conflicts)"
 msgstr "Vlastnosti (s konfliktmi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:202
 msgid "Pending property conflicts to be resolved"
 msgstr "Nebyriešený konflikty vlastností musia byť vyriešené"
@@ -4711,22 +4624,22 @@
 msgstr "položka {0} sa v zozname nenachádza"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:218
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:217
 msgid "lock scrolling"
 msgstr "zablokovať rolovanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:226
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:225
 msgid "Compare "
 msgstr "Porovnať "
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:260
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:78
 msgid "My version"
 msgstr "Moja verzia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:262
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:261
 msgid "List of elements in my dataset, i.e. the local dataset"
 msgstr "Zoznam elementov v mojej dátovej sade, i.e. miestna dátová sada"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:266
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:84
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:137
@@ -4734,5 +4647,5 @@
 msgstr "Spojovaná verzia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:268
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:267
 msgid ""
 "List of merged elements. They will replace the my elements when the merge "
@@ -4742,31 +4655,31 @@
 "rozhodnutie pre spojenie bude aplikované"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:272
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:90
 msgid "Their version"
 msgstr "Ich verzia"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:274
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:273
 msgid "List of elements in their dataset, i.e. the server dataset"
 msgstr "Zoznam elementov v ich dátovej sade, i.e. v dátovej sade servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:406
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:405
 msgid "> top"
 msgstr "> hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:408
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:407
 msgid "Copy my selected nodes to the start of the merged node list"
 msgstr "Kopírovať moje vybrané body na začiatok zoznamu pre spojované body"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:433
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:432
 msgid "> bottom"
 msgstr "> dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:435
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:434
 msgid "Copy my selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopírovať moje vybrané elementy na koniec zoznamu pre spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:462
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:461
 msgid ""
 "Copy my selected elements before the first selected element in the list of "
@@ -4776,5 +4689,5 @@
 "spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:496
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:495
 msgid ""
 "Copy my selected elements after the first selected element in the list of "
@@ -4784,5 +4697,5 @@
 "spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:525
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:524
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
@@ -4790,10 +4703,10 @@
 "Kopírovať ich vybrané elementy na začiatok zoznamu pre spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:547
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:546
 msgid "Copy their selected elements to the end of the list of merged elements."
 msgstr ""
 "Kopírovať ich vybrané elementy na koniec zoznamu pre spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:569
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:568
 msgid ""
 "Copy their selected elements before the first selected element in the list "
@@ -4803,5 +4716,5 @@
 "spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:598
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:597
 msgid ""
 "Copy their selected element after the first selected element in the list of "
@@ -4811,23 +4724,23 @@
 "spojované elementy"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:625
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:624
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Up"
 msgstr "Hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:627
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:626
 msgid "Move up the selected elements by one position."
 msgstr "Posunúť hore vybrané elementy s rovnakou pozíciou"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:656
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
 msgid "Down"
 msgstr "Dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:659
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:658
 msgid "Move down the selected entries by one position."
 msgstr "Posunúť dole vybrané elementy s rovnakou pozíciou"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:689
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:688
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:30
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
@@ -4838,27 +4751,27 @@
 msgstr "Odstrániť"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:691
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:690
 msgid "Remove the selected entries from the list of merged elements."
 msgstr "Odstrániť vybrané položky zo zoznamu spojovaných elementov"
 
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:719
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:756
+msgid "Freeze"
+msgstr "Blokovať"
+
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:720
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:757
-msgid "Freeze"
-msgstr "Blokovať"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:721
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:758
 msgid "Freeze the current list of merged elements."
 msgstr "Blokovať aktuálny zoznam spojovaných elementov"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:752
 msgid "Unfreeze"
 msgstr "Odblokovať"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:754
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:753
 msgid "Unfreeze the list of merged elements and start merging."
 msgstr "Odblokovať zoznam spojovaných elementov a začať spojovanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:781
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:778
 #, java-format
 msgid ""
@@ -4869,5 +4782,5 @@
 "položiek</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:786
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:783
 #, java-format
 msgid ""
@@ -4878,5 +4791,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:801
 #, java-format
 msgid "My version ({0} entry)"
@@ -4886,5 +4799,5 @@
 msgstr[2] "Moja verzia ({0} vstupov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:804
 #, java-format
 msgid "Merged version ({0} entry)"
@@ -4894,5 +4807,5 @@
 msgstr[2] "Spojovaná verzia ({0} vstupov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:810
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:807
 #, java-format
 msgid "Their version ({0} entry)"
@@ -4902,5 +4815,5 @@
 msgstr[2] "Ich verzia ({0} vstupov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:875
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:872
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
 #, java-format
@@ -4912,5 +4825,5 @@
 "nastavení synchronizácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:890
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:887
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
 #, java-format
@@ -5158,10 +5071,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:18
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:28
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:184
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
 #: ../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:260
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:64
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:63
 #: ../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
@@ -5171,10 +5084,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java:25
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:200
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:443
 #: ../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:264
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:71
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:70
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
@@ -5259,9 +5172,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:142
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1094
 msgid "Apply"
 msgstr "Použiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:170
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:166
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
@@ -5269,6 +5182,6 @@
 msgstr "žiadny"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:174
-#: build/trans_presets.java:2301
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
+#: build/trans_presets.java:2290
 msgid "all"
 msgstr "všetky"
@@ -5359,7 +5272,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:325
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
 #, java-format
 msgid "{0} way"
@@ -5370,6 +5283,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
 #, java-format
 msgid "{0} relation"
@@ -5494,4 +5407,61 @@
 msgstr "Zobraziť iba značky(tags) s konfliktami"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:130
+#, fuzzy
+msgid "For selected objects only"
+msgstr "Zmazať zvolené objekty."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:131
+#, fuzzy
+msgid ""
+"<html>Select to show changesets for the currently selected objects only."
+"<br>Unselect to show all changesets for objects in the current data layer.</"
+"html>"
+msgstr ""
+"<html>Zvoliť pre stiahnutie dát na novú dátovú vrstvu.<br>Zrušiť voľbu pre "
+"stiahnutie na aktuálne aktívnu dátovú vrstvu.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+#, fuzzy
+msgid "Changesets"
+msgstr "Zmenový súbor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:221
+#, fuzzy
+msgid "Open the list of changesets in the current layer."
+msgstr "Priblížiť k tomuto bodu v aktuálnej vrstve"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:266
+#, fuzzy
+msgid "Select all objects assigned to the currently selected changesets"
+msgstr "Zatvoriť práve vybratý otvorený zmenový súbor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
+msgid "Download"
+msgstr "Stiahnuť"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:326
+#, fuzzy
+msgid "Download information about the selected changesets from the OSM server"
+msgstr "Stiahnutie mapových údajov z OSM servera."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:361
+#, fuzzy
+msgid "Closes the selected open changesets"
+msgstr "Zavrieť vybrané otvorené zmenové súbory"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:392
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:178
+msgid "Show info"
+msgstr "Zobraz info"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:393
+#, fuzzy
+msgid "Open a web page for each selected changeset"
+msgstr "Otvoriť editor pre zvolenú reláciu"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
@@ -5505,12 +5475,12 @@
 
 #: ../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/FilterDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:53
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:133
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
@@ -5528,13 +5498,13 @@
 msgstr "Príkazový Stĺpik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
 msgid "Resolve conflicts."
 msgstr "Vyriešiť konflikty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:329
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:336
 msgid "Resolve"
 msgstr "Vyriešiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5542,6 +5512,6 @@
 "v obsahu na vrchu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:350
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:106
 msgid ""
@@ -5551,25 +5521,25 @@
 "vrchu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:167
 msgid "Cancel conflict resolution and close the dialog"
 msgstr "Zrušiť rozhodnutie konfliktu a zavrieť dialóg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:200
 msgid "Apply resolved conflicts and close the dialog"
 msgstr "Použiť rozhodnutie konfliktu a zavrieť dialóg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:202
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:201
 msgid "Apply Resolution"
 msgstr "Použiť rozhodnutie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:213
 msgid "Close anyway"
 msgstr "Zavrieť akúkoľvek cestu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:215
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:214
 msgid "Continue resolving"
 msgstr "Pokračovanie rozhodnutia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:217
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216
 #, java-format
 msgid ""
@@ -5586,26 +5556,26 @@
 "<strong>{1}</strong> to return to resolving conflicts.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
 msgid "Conflict not resolved completely"
 msgstr "Konflikt nie je úplne vyriešený"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:261
 msgid "Resolve conflicts"
 msgstr "Rozhodnutie konfliktov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:263
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
 msgstr "Rozhodnúť konflikt pre ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:52
 msgid "Filter objects and hide/disable them."
 msgstr "Filtrovať objekty a schovať/vypnúť ich."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:889
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:255
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:254
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:78
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:107
@@ -5616,41 +5586,41 @@
 msgstr "Pridať"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 msgid "Add filter."
 msgstr "Pridať filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
 msgid "Edit filter."
 msgstr "Upraviť filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 msgid "Delete filter."
 msgstr "Zmazať filter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Move filter up."
 msgstr "Posunúť filter hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
 msgid "Move filter down."
 msgstr "Posunúť filter dole."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Enable filter"
 msgstr "Zapnúť filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130
 msgid "Hide elements"
 msgstr "Schovať prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
 msgid "Apply also for children"
 msgstr "Uplatniť tiež pre deti(children)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Inverse filter"
 msgstr "Obrátený filter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134
 msgid "Filter mode"
 msgstr "Režim filter"
@@ -5689,5 +5659,5 @@
 msgstr "Zobraziť históriu(priebeh) vybraných objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82
 msgid "Dialog not created yet. Invoke createInstance() first"
 msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first"
@@ -5702,34 +5672,34 @@
 msgstr "Otvoriť zoznam všetkých nahratých vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:293
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:270
 msgid "Delete the selected layer."
 msgstr "Odstrániť vybranú vrstvu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:340
 msgid "Show/Hide"
 msgstr "Zobraziť/Skryť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:351
 msgid "Toggle visible state of the selected layer."
 msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:410
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:387
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Aktivovať"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:416
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:393
 msgid "Activate the selected layer"
 msgstr "Aktivovať vybratú vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:471
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:458
 msgid "Merge this layer into another layer"
 msgstr "Spojiť túto vrstvu do ďalšej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:577
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:567
 msgid "Move the selected layer one row up."
 msgstr "Presunúť zvolenú vrstvu o riadok hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:596
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:586
 msgid "Move the selected layer one row down."
 msgstr "Presunúť zvolenú vrstvu o riadok dole."
@@ -5739,5 +5709,182 @@
 msgstr "Informácie o vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:152
+#. item "Land use/Quarry" text "Name"
+#. <!-- FIXME: element role not yet supported! -->
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: build/trans_presets.java:3154
+msgid "Relations"
+msgstr "Relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:86
+msgid "Open a list of all relations."
+msgstr "Otvoríť zoznam všetkých relácií"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:169
+#, java-format
+msgid "Relations: {0}"
+msgstr "Relácie: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+msgid "Open an editor for the selected relation"
+msgstr "Otvoriť editor pre zvolenú reláciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+msgid "Delete the selected relation"
+msgstr "Zmazať vybraté relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:342
+msgid "Create a new relation"
+msgstr "Vytvoriť novú reláciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:379
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1334
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:417
+msgid "Set the current selection to the list of selected relations"
+msgstr "Pridať aktuálny výber do zoznamu vybratých relácií"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:444
+msgid "Select the members of all selected relations"
+msgstr "Výber členov zo všetkých vybraných relácií"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+msgid "Select members"
+msgstr "Výber členov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:476
+msgid "Download all members of the selected relations"
+msgstr "Stiahnutie všetkých členov z vybraných relácií"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:477
+msgid "Download members"
+msgstr "Stiahnuť členov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+msgid "Current Selection"
+msgstr "Súčasný výber"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+msgid "Open a selection list window."
+msgstr "Otvoriť výber obsahu okien."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:131
+msgid "Zoom to selected element(s)"
+msgstr "Priblížiť na vybraté elementy(s)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:150
+msgid "Zoom to selection"
+msgstr "Priblížiť na výber"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
+#, java-format
+msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
+msgstr "Sel.: Rel.:{0} / Cesty:{1} / Body:{2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:296
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
+msgid "Selection"
+msgstr "Výber"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:348
+#, java-format
+msgid "Selection: {0}"
+msgstr "Výber: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:345
+msgid "Undock the panel"
+msgstr "Uvoľniť panel"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:359
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgstr ""
+"Zavrieť tento panel. Môžete ho znovu otvoriť  tlačítkom na ľavej nástrojovej "
+"lište."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:370
+msgid "Click to minimize/maximize the panel content"
+msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu"
+
+#: ../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:141
+msgid "Authors"
+msgstr "Autori (spracovatelia)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
+msgid "Open a list of people working on the selected objects."
+msgstr "Otvoríť zoznam ľudí, kterí pracujú na zvolenom objekte"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:139
+#, java-format
+msgid "{0} Author"
+msgid_plural "{0} Authors"
+msgstr[0] "Autori"
+msgstr[1] "Autor"
+msgstr[2] "Autorov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:148
+msgid "Select primitives submitted by this user"
+msgstr "Výber pôvodných, doplnených týmto používateľom"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:179
+msgid "Launches a browser with information about the user"
+msgstr "Uvedený prehliadač s informáciou o používateľovi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191
+#, java-format
+msgid ""
+"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgstr ""
+"Varovanie: iba pre uvedené info prehliadača pre prvého {0} z {1} vybraných "
+"používateľov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:214
+#, java-format
+msgid ""
+"<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
+"missing on this system.</html>"
+msgstr ""
+"<html>Neúspešné vytvorenie URL pretože šifrovanie ''{0}'' bolo<br>chýbalo v "
+"tomto systéme.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216
+msgid "Missing encoding"
+msgstr "Chýbajúce šifrovanie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278
+msgid "Author"
+msgstr "Autor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278
+msgid "# Objects"
+msgstr "# Objekty"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
+#, fuzzy, java-format
+msgid "{0} [incomplete]"
+msgstr "neúplný"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
+msgid "open"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
+#, fuzzy
+msgid "closed"
+msgstr "uzavratá cesta"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/DownloadChangesetsTask.java:31
+#, fuzzy
+msgid "Download changesets"
+msgstr "Sťahujem zmenové súbory..."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:169
 #, java-format
 msgid "This will change {0} object."
@@ -5747,22 +5894,22 @@
 msgstr[2] "Toto chce zmeniť {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:171
 msgid "An empty value deletes the tag."
 msgstr "Prázdna hodnota vymaže tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:197
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:247
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:500
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
 msgid "<different>"
 msgstr "<rôzne>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:211
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:352
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:354
 msgid "Change values?"
 msgstr "Zmeniť hodnoty ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:269
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:284
 #, java-format
 msgid "Change properties of up to {0} object"
@@ -5772,5 +5919,5 @@
 msgstr[2] "Zmeniť vlastnosti až {0} objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:327
 #, java-format
 msgid "This will change up to {0} object."
@@ -5780,233 +5927,71 @@
 msgstr[2] "Toto zmení až {0} objekty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:330
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:329
 msgid "Please select a key"
 msgstr "Vyberte prosím kľúč"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:342
 msgid "Please select a value"
 msgstr "Vyberte prosím hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:432
 msgid "Please select the objects you want to change properties for."
 msgstr "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:461
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:439
 msgid "Properties/Memberships"
 msgstr "Vlastnosti/Členstvo(memberships)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:460
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:438
 msgid "Properties for selected objects."
 msgstr "Vlastnosti pre zvolené objekty"
 
 #. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:494
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:472
 msgid "Member Of"
 msgstr "Člen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:547
 msgid "Add Properties"
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:791
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:773
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:794
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:776
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:836
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:813
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:815
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:857
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:833
 msgid "Delete the selected key in all objects"
 msgstr "Zmaže zvolený klúč vo všetkých objektoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:859
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:835
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Add a new key/value pair to all objects"
 msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:902
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:878
 msgid "Edit the value of the selected key for all objects"
 msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
-
-#. item "Land use/Quarry" text "Name"
-#. <!-- FIXME: element role not yet supported! -->
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:178
-#: build/trans_presets.java:3151
-msgid "Relations"
-msgstr "Relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:82
-msgid "Open a list of all relations."
-msgstr "Otvoríť zoznam všetkých relácií"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:176
-#, java-format
-msgid "Relations: {0}"
-msgstr "Relácie: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:270
-msgid "Open an editor for the selected relation"
-msgstr "Otvoriť editor pre zvolenú reláciu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:311
-msgid "Delete the selected relation"
-msgstr "Zmazať vybraté relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
-msgid "Create a new relation"
-msgstr "Vytvoriť novú reláciu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1330
-msgid "Create a copy of this relation and open it in another editor window"
-msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:424
-msgid "Set the current selection to the list of selected relations"
-msgstr "Pridať aktuálny výber do zoznamu vybratých relácií"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:451
-msgid "Select the members of all selected relations"
-msgstr "Výber členov zo všetkých vybraných relácií"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:453
-msgid "Select members"
-msgstr "Výber členov"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:483
-msgid "Download all members of the selected relations"
-msgstr "Stiahnutie všetkých členov z vybraných relácií"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:484
-msgid "Download members"
-msgstr "Stiahnuť členov"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87
-msgid "Current Selection"
-msgstr "Súčasný výber"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
-msgid "Open a selection list window."
-msgstr "Otvoriť výber obsahu okien."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:133
-msgid "Zoom to selected element(s)"
-msgstr "Priblížiť na vybraté elementy(s)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:152
-msgid "Zoom to selection"
-msgstr "Priblížiť na výber"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:281
-#, java-format
-msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
-msgstr "Sel.: Rel.:{0} / Cesty:{1} / Body:{2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:283
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:343
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
-msgid "Selection"
-msgstr "Výber"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335
-#, java-format
-msgid "Selection: {0}"
-msgstr "Výber: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:346
-msgid "Undock the panel"
-msgstr "Uvoľniť panel"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:360
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
-msgstr ""
-"Zavrieť tento panel. Môžete ho znovu otvoriť  tlačítkom na ľavej nástrojovej "
-"lište."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:371
-msgid "Click to minimize/maximize the panel content"
-msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu"
-
-#: ../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 "Autori (spracovatelia)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
-msgid "Open a list of people working on the selected objects."
-msgstr "Otvoríť zoznam ľudí, kterí pracujú na zvolenom objekte"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:133
-#, java-format
-msgid "{0} Author"
-msgid_plural "{0} Authors"
-msgstr[0] "Autori"
-msgstr[1] "Autor"
-msgstr[2] "Autorov"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
-msgid "Select primitives submitted by this user"
-msgstr "Výber pôvodných, doplnených týmto používateľom"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
-msgid "Show info"
-msgstr "Zobraz info"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
-msgid "Launches a browser with information about the user"
-msgstr "Uvedený prehliadač s informáciou o používateľovi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
-#, java-format
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr ""
-"Varovanie: iba pre uvedené info prehliadača pre prvého {0} z {1} vybraných "
-"používateľov"
-
-#: ../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 ""
-"<html>Neúspešné vytvorenie URL pretože šifrovanie ''{0}'' bolo<br>chýbalo v "
-"tomto systéme.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
-msgid "Missing encoding"
-msgstr "Chýbajúce šifrovanie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
-msgid "Author"
-msgstr "Autor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
-msgid "# Objects"
-msgstr "# Objekty"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
@@ -6069,20 +6054,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:85
-#, fuzzy, java-format
+#, java-format
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "Sťahovanie relácie ''{0}''"
-msgstr[1] "Sťahovanie relácie ''{0}''"
-msgstr[2] "Sťahovanie relácie ''{0}''"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
-#, fuzzy
 msgid "Download relations"
-msgstr "Stiahnuť členov relácie"
+msgstr "Sťahovanie relácií"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}: Downloading relation ''{2}''..."
-msgstr "Sťahovanie relácie ''{0}''"
+msgstr "({0}/{1}: Sťahovanie relácie ''{2}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:148
@@ -6100,14 +6083,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
-#, fuzzy
 msgid "Apply Role:"
-msgstr "Použiť Funkciu"
+msgstr "Použiť Funkciu:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
-#, fuzzy
 msgid "Enter a role and apply it to the selected relation members"
-msgstr "Vložiť funkcie pre všetkých členov relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
+msgstr "Vložiť funkciu a použiť na vybraté členy relácie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:567
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -6119,14 +6100,14 @@
 "chcete pokračovať s kruhovou závislosťou?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:570
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
 msgid "Remove them, clean up relation"
 msgstr "Odstraňte ich, vyčistite reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:569
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorujte ich, nechajte reláciu tak ako je"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:592
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:597
 #, java-format
 msgid ""
@@ -6139,9 +6120,9 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:607
 msgid "Multiple members referring to same primitive"
 msgstr "Viacnásobné členy odkazujú na rovnaké obecné"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:620
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:625
 #, java-format
 msgid ""
@@ -6153,5 +6134,5 @@
 "odkazy a je preto znechutený.<br>Vynechanie relácie ''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:661
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:666
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -6159,5 +6140,5 @@
 "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:687
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:692
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -6165,5 +6146,5 @@
 "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:714
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:719
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -6173,5 +6154,5 @@
 "členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:748
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:753
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -6181,20 +6162,20 @@
 "členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:780
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:785
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:783
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:788
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor Relácií: Odstrániť Vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:817
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:822
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:834
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:832
 #, java-format
 msgid ""
@@ -6204,69 +6185,69 @@
 "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:856
 msgid "Select primitives for selected relation members"
 msgstr "Výber pôvodných pre vybraté členy relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:871
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:876
 msgid "Sort the relation members"
 msgstr "Triedenie členov relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:878
 msgid "Sort"
 msgstr "Triediť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:874
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:879
 msgid "Relation Editor: Sort"
 msgstr "Editor Relácií: Triedenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:899
 msgid "Move the currently selected members up"
 msgstr "Pridať všetky zvolené objekty medzi členy"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:902
 msgid "Relation Editor: Move Up"
 msgstr "Editor Relácií: Posun Hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:913
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
 msgid "Move the currently selected members down"
 msgstr "Presunúť zvolenú vrstvu o riadok dolu."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:921
 msgid "Relation Editor: Move Down"
 msgstr "Editor Relácií: Posun Dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:937
 msgid "Remove the currently selected members from this relation"
 msgstr "Odstrániť práve vybraté členy z tejto relácie"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:935
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
 msgid "Relation Editor: Remove"
 msgstr "Editor Relácií: Odstrániť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:951
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:956
 msgid "Delete the currently edited relation"
 msgstr "Vymazať práve vydanú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1041
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1046
 msgid "Yes, create a conflict and close"
 msgstr "Áno, vyriešiť konflikt a zavrieť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1043
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1048
 msgid "Click to create a conflict and close this relation editor"
 msgstr "Kliknutie vytvorí konflikt a zatvorí editor tejto relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1047
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1052
 msgid "No, continue editing"
 msgstr "Nie, pokračovať v editácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "Click to to return to the relation editor and to resume relation editing"
 msgstr "Kliknutie navráti editor relácie a pokračuje v editovaní relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1056
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1061
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -6278,9 +6259,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1060
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1065
 msgid "Conflict in data"
 msgstr "Konflikt v dátach"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078
 #, java-format
 msgid ""
@@ -6291,49 +6272,47 @@
 "rozhodnite najskôr tento konflikt, potom skúste znovu.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1087
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply the current updates"
 msgstr "Použiť súčasnú aktuálizáciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
 msgid "Apply the updates and close the dialog"
 msgstr "Použiť aktualizácie a zavrieť dialógové okno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 msgid "Cancel the updates and close the dialog"
 msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1176
 msgid "Add an empty tag"
 msgstr "Pridať prázdnu značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1184
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download all incomplete members"
-msgstr "Stiahnuť členov relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
+msgstr "Stiahnuť všetký nekompletné členy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
 msgid "Download Members"
 msgstr "Stiahnuť členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1227
 msgid "Relation Editor: Download Members"
 msgstr "Editor Relácií: Sťahovanie Členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Download selected incomplete members"
-msgstr "Stiahnuť členov relácie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1258
+msgstr "Stiahnuť vybraté nekompletné členy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1263
 msgid "Sets a role for the selected members"
 msgstr "Nastavenie funkcie pre vybrané členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1265
 msgid "Apply Role"
 msgstr "Použiť Funkciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278
 #, java-format
 msgid ""
@@ -6346,34 +6325,34 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1278
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1282
 msgid "Yes, apply it"
 msgstr "Áno, Použiť to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1279
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "No, don't apply"
 msgstr "Nie, použite to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1285
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1289
 msgid "Confirm empty role"
 msgstr "Potvrdiť prázdnu funkciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1353
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1357
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
 msgid "Zoom to"
 msgstr "Zväčšiť na"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:222
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:221
 msgid "Zoom to the object the first selected member refers to"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:213
+msgstr "Priblížiť na objekt prvého vybratého člena odkazujúceho na"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212
 msgid "Zooming disabled because layer of this relation is not active"
 msgstr "Zväčšovanie je vypnuté pretože vrstva z tejto relácie nie je aktívna"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:218
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217
 msgid "Zooming disabled because there is no selected member"
 msgstr "Zväčšovanie je vypnuté pretože nie je vybratý člen"
@@ -6491,10 +6470,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:250
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
 msgid "Please enter a name for the bookmarked download area."
 msgstr "Prosím zvoľte názov pre záložku zo sťahovanej oblasti"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
 msgid "Name of location"
 msgstr "Názov miesta"
@@ -6504,5 +6483,5 @@
 msgstr "Vymazať vybraté záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:238
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
 msgid "Rename the currently selected bookmark"
 msgstr "Premenovať vybratú záložku"
@@ -6590,9 +6569,4 @@
 msgid "Download Area"
 msgstr "Stiahnuť plochu"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:175
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:389
-msgid "Download"
-msgstr "Stiahnuť"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
@@ -6895,6 +6869,4 @@
 #. item "Car/Wash" label "Edit Car Wash"
 #. <key key="amenity" value="car_wash" />
-#. item "Car/Shop" label "Edit Car Shop"
-#. <key key="shop" value="car" />
 #. item "Car/Repair" label "Edit Car Repair"
 #. <key key="shop" value="car_repair" />
@@ -6907,6 +6879,4 @@
 #. item "Bicycle/Rental" label "Edit Bicycle Rental"
 #. <key key="amenity" value="bicycle_rental" />
-#. item "Bicycle/Shop" label "Edit Bicycle Shop"
-#. <key key="shop" value="bicycle" />
 #. item "Public Transport/Station" label "Edit Station"
 #. <space />
@@ -7177,4 +7147,8 @@
 #. item "Amenities/Drinking Water" label "Edit Drinking Water"
 #. <key key="amenity" value="drinking_water" />
+#. item "Shops/Car Dealer" label "Edit Car Shop"
+#. <key key="shop" value="car" />
+#. item "Shops/Bike Dealer" label "Edit Bicycle Shop"
+#. <key key="shop" value="bicycle" />
 #. item "Shops/Supermarket" label "Edit Supermarket"
 #. <key key="shop" value="supermarket" />
@@ -7397,5 +7371,5 @@
 #. <key key="type" value="multipolygon" />
 #. <optional>
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:394
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:392
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:390
@@ -7438,116 +7412,116 @@
 #: build/trans_presets.java:1384 build/trans_presets.java:1395
 #: build/trans_presets.java:1404 build/trans_presets.java:1419
-#: build/trans_presets.java:1426 build/trans_presets.java:1432
-#: build/trans_presets.java:1440 build/trans_presets.java:1447
-#: build/trans_presets.java:1456 build/trans_presets.java:1464
-#: build/trans_presets.java:1471 build/trans_presets.java:1482
-#: build/trans_presets.java:1492 build/trans_presets.java:1502
-#: build/trans_presets.java:1522 build/trans_presets.java:1534
-#: build/trans_presets.java:1545 build/trans_presets.java:1562
-#: build/trans_presets.java:1569 build/trans_presets.java:1585
-#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1425 build/trans_presets.java:1433
+#: build/trans_presets.java:1440 build/trans_presets.java:1449
+#: 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:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
 #: build/trans_presets.java:1603 build/trans_presets.java:1609
-#: build/trans_presets.java:1614 build/trans_presets.java:1620
-#: build/trans_presets.java:1626 build/trans_presets.java:1634
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
-#: build/trans_presets.java:1657 build/trans_presets.java:1663
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1700 build/trans_presets.java:1707
-#: build/trans_presets.java:1713 build/trans_presets.java:1720
-#: build/trans_presets.java:1727 build/trans_presets.java:1734
-#: build/trans_presets.java:1751 build/trans_presets.java:1759
-#: build/trans_presets.java:1774 build/trans_presets.java:1784
-#: build/trans_presets.java:1796 build/trans_presets.java:1803
-#: build/trans_presets.java:1809 build/trans_presets.java:1819
-#: build/trans_presets.java:1824 build/trans_presets.java:1832
-#: build/trans_presets.java:1839 build/trans_presets.java:1845
-#: build/trans_presets.java:1851 build/trans_presets.java:1857
-#: build/trans_presets.java:1862 build/trans_presets.java:1867
-#: build/trans_presets.java:1872 build/trans_presets.java:1879
-#: build/trans_presets.java:1885 build/trans_presets.java:1890
-#: build/trans_presets.java:1899 build/trans_presets.java:1908
-#: build/trans_presets.java:1917 build/trans_presets.java:1926
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1949 build/trans_presets.java:1955
-#: build/trans_presets.java:1961 build/trans_presets.java:1967
-#: build/trans_presets.java:1973 build/trans_presets.java:1979
-#: build/trans_presets.java:1985 build/trans_presets.java:1991
-#: build/trans_presets.java:1997 build/trans_presets.java:2003
-#: build/trans_presets.java:2009 build/trans_presets.java:2015
-#: build/trans_presets.java:2021 build/trans_presets.java:2027
-#: build/trans_presets.java:2033 build/trans_presets.java:2040
-#: build/trans_presets.java:2049 build/trans_presets.java:2057
-#: build/trans_presets.java:2063 build/trans_presets.java:2069
-#: build/trans_presets.java:2075 build/trans_presets.java:2081
-#: build/trans_presets.java:2087 build/trans_presets.java:2093
-#: build/trans_presets.java:2099 build/trans_presets.java:2105
-#: build/trans_presets.java:2111 build/trans_presets.java:2117
-#: build/trans_presets.java:2123 build/trans_presets.java:2129
-#: build/trans_presets.java:2135 build/trans_presets.java:2141
-#: build/trans_presets.java:2147 build/trans_presets.java:2153
-#: build/trans_presets.java:2167 build/trans_presets.java:2173
-#: build/trans_presets.java:2179 build/trans_presets.java:2186
-#: build/trans_presets.java:2193 build/trans_presets.java:2201
-#: build/trans_presets.java:2208 build/trans_presets.java:2214
-#: build/trans_presets.java:2221 build/trans_presets.java:2227
-#: build/trans_presets.java:2233 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2254
-#: build/trans_presets.java:2261 build/trans_presets.java:2268
-#: build/trans_presets.java:2276 build/trans_presets.java:2308
-#: build/trans_presets.java:2313 build/trans_presets.java:2323
-#: build/trans_presets.java:2328 build/trans_presets.java:2334
-#: build/trans_presets.java:2340 build/trans_presets.java:2357
-#: build/trans_presets.java:2363 build/trans_presets.java:2369
-#: build/trans_presets.java:2375 build/trans_presets.java:2381
-#: build/trans_presets.java:2391 build/trans_presets.java:2398
-#: build/trans_presets.java:2492 build/trans_presets.java:2499
-#: build/trans_presets.java:2513 build/trans_presets.java:2519
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2539 build/trans_presets.java:2545
-#: build/trans_presets.java:2567 build/trans_presets.java:2574
-#: build/trans_presets.java:2581 build/trans_presets.java:2587
-#: build/trans_presets.java:2594 build/trans_presets.java:2600
-#: build/trans_presets.java:2606 build/trans_presets.java:2612
-#: build/trans_presets.java:2618 build/trans_presets.java:2624
-#: build/trans_presets.java:2631 build/trans_presets.java:2638
-#: build/trans_presets.java:2645 build/trans_presets.java:2651
-#: build/trans_presets.java:2657 build/trans_presets.java:2663
-#: build/trans_presets.java:2669 build/trans_presets.java:2675
-#: build/trans_presets.java:2682 build/trans_presets.java:2689
-#: build/trans_presets.java:2696 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2718
-#: build/trans_presets.java:2727 build/trans_presets.java:2742
-#: build/trans_presets.java:2748 build/trans_presets.java:2756
-#: build/trans_presets.java:2763 build/trans_presets.java:2783
-#: build/trans_presets.java:2794 build/trans_presets.java:2800
-#: build/trans_presets.java:2806 build/trans_presets.java:2812
-#: build/trans_presets.java:2818 build/trans_presets.java:2825
-#: build/trans_presets.java:2832 build/trans_presets.java:2839
-#: build/trans_presets.java:2845 build/trans_presets.java:2851
-#: build/trans_presets.java:2859 build/trans_presets.java:2866
-#: build/trans_presets.java:2873 build/trans_presets.java:2880
-#: build/trans_presets.java:2886 build/trans_presets.java:2893
-#: build/trans_presets.java:2900 build/trans_presets.java:2909
-#: build/trans_presets.java:2915 build/trans_presets.java:2921
-#: build/trans_presets.java:2927 build/trans_presets.java:2933
-#: build/trans_presets.java:2942 build/trans_presets.java:2952
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2973 build/trans_presets.java:2978
-#: build/trans_presets.java:2984 build/trans_presets.java:2990
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3017
-#: build/trans_presets.java:3023 build/trans_presets.java:3029
-#: build/trans_presets.java:3035 build/trans_presets.java:3042
-#: build/trans_presets.java:3048 build/trans_presets.java:3053
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3082
-#: build/trans_presets.java:3090 build/trans_presets.java:3096
-#: build/trans_presets.java:3102 build/trans_presets.java:3109
-#: build/trans_presets.java:3115 build/trans_presets.java:3122
-#: build/trans_presets.java:3128 build/trans_presets.java:3134
-#: build/trans_presets.java:3140 build/trans_presets.java:3146
-#: build/trans_presets.java:3159 build/trans_presets.java:3173
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1846
+#: build/trans_presets.java:1851 build/trans_presets.java:1856
+#: build/trans_presets.java:1861 build/trans_presets.java:1868
+#: build/trans_presets.java:1874 build/trans_presets.java:1879
+#: build/trans_presets.java:1888 build/trans_presets.java:1897
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1930
+#: build/trans_presets.java:1938 build/trans_presets.java:1944
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2029
+#: build/trans_presets.java:2038 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2168 build/trans_presets.java:2175
+#: build/trans_presets.java:2182 build/trans_presets.java:2190
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2210 build/trans_presets.java:2216
+#: build/trans_presets.java:2222 build/trans_presets.java:2228
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2257
+#: build/trans_presets.java:2265 build/trans_presets.java:2297
+#: build/trans_presets.java:2302 build/trans_presets.java:2312
+#: build/trans_presets.java:2317 build/trans_presets.java:2323
+#: build/trans_presets.java:2329 build/trans_presets.java:2346
+#: build/trans_presets.java:2352 build/trans_presets.java:2358
+#: build/trans_presets.java:2364 build/trans_presets.java:2370
+#: build/trans_presets.java:2380 build/trans_presets.java:2387
+#: build/trans_presets.java:2481 build/trans_presets.java:2488
+#: build/trans_presets.java:2503 build/trans_presets.java:2511
+#: build/trans_presets.java:2516 build/trans_presets.java:2522
+#: build/trans_presets.java:2529 build/trans_presets.java:2536
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2570 build/trans_presets.java:2577
+#: build/trans_presets.java:2584 build/trans_presets.java:2590
+#: build/trans_presets.java:2597 build/trans_presets.java:2603
+#: build/trans_presets.java:2609 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2634 build/trans_presets.java:2641
+#: build/trans_presets.java:2648 build/trans_presets.java:2654
+#: build/trans_presets.java:2660 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2685 build/trans_presets.java:2692
+#: build/trans_presets.java:2699 build/trans_presets.java:2705
+#: build/trans_presets.java:2711 build/trans_presets.java:2721
+#: build/trans_presets.java:2730 build/trans_presets.java:2745
+#: build/trans_presets.java:2751 build/trans_presets.java:2759
+#: build/trans_presets.java:2766 build/trans_presets.java:2786
+#: build/trans_presets.java:2797 build/trans_presets.java:2803
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2828
+#: build/trans_presets.java:2835 build/trans_presets.java:2842
+#: build/trans_presets.java:2848 build/trans_presets.java:2854
+#: build/trans_presets.java:2862 build/trans_presets.java:2869
+#: build/trans_presets.java:2876 build/trans_presets.java:2883
+#: build/trans_presets.java:2889 build/trans_presets.java:2896
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2918 build/trans_presets.java:2924
+#: build/trans_presets.java:2930 build/trans_presets.java:2936
+#: build/trans_presets.java:2945 build/trans_presets.java:2955
+#: build/trans_presets.java:2964 build/trans_presets.java:2970
+#: build/trans_presets.java:2976 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:3002 build/trans_presets.java:3008
+#: build/trans_presets.java:3014 build/trans_presets.java:3020
+#: build/trans_presets.java:3026 build/trans_presets.java:3032
+#: build/trans_presets.java:3038 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3056
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3085
+#: build/trans_presets.java:3093 build/trans_presets.java:3099
+#: build/trans_presets.java:3105 build/trans_presets.java:3112
+#: build/trans_presets.java:3118 build/trans_presets.java:3125
+#: build/trans_presets.java:3131 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3149
+#: build/trans_presets.java:3162 build/trans_presets.java:3176
+#: build/trans_presets.java:3190
 msgid "Name"
 msgstr "Názov"
@@ -7571,15 +7545,15 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:402
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:400
 #: build/trans_presets.java:361 build/trans_presets.java:660
 #: build/trans_presets.java:800 build/trans_presets.java:1148
-#: build/trans_presets.java:1406 build/trans_presets.java:2348
-#: build/trans_presets.java:2390 build/trans_presets.java:2416
-#: build/trans_presets.java:2943 build/trans_presets.java:2953
-#: build/trans_presets.java:2962
+#: build/trans_presets.java:1406 build/trans_presets.java:2337
+#: build/trans_presets.java:2379 build/trans_presets.java:2405
+#: build/trans_presets.java:2946 build/trans_presets.java:2956
+#: build/trans_presets.java:2965
 msgid "Type"
 msgstr "Typ"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:410
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:408
 msgid "Near"
 msgstr "Blízko"
@@ -7759,11 +7733,11 @@
 msgstr "Načítať históriu zo serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:273
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
 msgid "History not initialized yet. Failed to set reference primitive."
 msgstr ""
 "priebeh nieje zatiaľ inicializovaný. Chyba odkazového súboru pôvodných."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:275
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:306
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:311
 #, java-format
 msgid ""
@@ -7772,5 +7746,5 @@
 "Neúspešné nastavenie odkazu. Odkaz ID {0} je nenájdený v histórii ID {1}."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:278
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:283
 #, java-format
 msgid ""
@@ -7778,9 +7752,9 @@
 msgstr "neúspešný zadaný odkaz. verzia odkazu {0} nie je platná v priebehu"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
 msgid "History not initialized yet. Failed to set current primitive."
 msgstr "priebeh nie je inicializovaný. Chybný súbor aktuálnych pôvodných."
 
-#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:314
 #, java-format
 msgid ""
@@ -7895,6 +7869,6 @@
 #: build/trans_presets.java:800 build/trans_presets.java:1344
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:2483
-#: build/trans_presets.java:2484 build/trans_presets.java:2485
+#: build/trans_presets.java:1413 build/trans_presets.java:2472
+#: build/trans_presets.java:2473 build/trans_presets.java:2474
 msgid "unknown"
 msgstr "neznámy"
@@ -7919,13 +7893,13 @@
 msgstr "anonymný"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Changeset info"
 msgstr "Info súboru zmien"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:121
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
 msgid "Launch browser with information about the changeset"
 msgstr "Uvedený prehliadač s informáciou o súbore zmien"
 
-#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:140
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139
 #, java-format
 msgid "Show changeset {0}"
@@ -7960,4 +7934,136 @@
 msgstr "Verzia"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62
+#, java-format
+msgid ""
+"Failed to update primitive with id {0} because current edit layer is null"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
+#, java-format
+msgid ""
+"Failed to update primitive with id {0} because current edit layer doesn't "
+"include such a primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
+#, java-format
+msgid "Synchronize node {0} only"
+msgstr "Synchronizovať iba {0} bod"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95
+#, java-format
+msgid "Synchronize way {0} only"
+msgstr "Synchronizovať iba {0} cestu"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96
+#, java-format
+msgid "Synchronize relation {0} only"
+msgstr "Synchronizovať iba {0} reláciu"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:106
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:154
+msgid "Synchronize entire dataset"
+msgstr "Synchronizovať celú dátovú sadu"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
+"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
+"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
+"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
+"strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>Aktualizácia <strong>neúspešná</strong> pretože server ná novú verziu "
+"jednu z<br>vaších bodov, ciest, alebo relácií.<br>Konflikt je zapríčinený "
+"<strong>{0}</strong> s id <strong>{1}</strong>,<br> server má verziu {2},"
+"vaša verzia je {3}.<br><br>Click <strong>{4}</strong> pre synchronizáciu iba "
+"sporných  pôvodných.<br>Click <strong>{5}</strong> pre synchronizáciu celej "
+"lokálnej dátovej sady so serverom.<br>Click <strong>{6}</strong> pre "
+"zrušenie a pokračovanie v editácii.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
+msgid "Conflicts detected"
+msgstr "Objavené konflikty"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because the server has a newer "
+"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
+"</strong> to synchronize the entire local dataset with the server.<br>Click "
+"<strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr ""
+"<html>Nahrávanie <strong>neúspešné</strong> pretože server má novú verziu "
+"jednu z <br>vašich bodov,ciest, alebo relácií.<br><br>Click <strong>{0}</"
+"strong>pre synchronizáciu celej lokálnej dátovej sady so serverom.<br>Click "
+"<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you''ve been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset.</html>"
+msgstr ""
+"<html>Nahrávanie <strong>neúspešné</strong> pretože ste použili<br>zmenový "
+"súbor {0} ktorý už bol zavretý v {1}.<br>Prosím nahrať znova s novým, alebo "
+"existujúcim zmenovým súborom.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
+msgid "Changeset closed"
+msgstr "Zmenový súbor zavretý"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214
+msgid "Prepare conflict resolution"
+msgstr "Pripravujem rozhodnutie konfliktov"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216
+#, java-format
+msgid "Click to download all parent ways for node {0}"
+msgstr "Kliknutím stiahnete všetky rodičovské cesty pre body {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222
+msgid "Click to cancel and to resume editing the map"
+msgstr "Kliknutím zrušíte a pokračujete v editovaní mapy"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you tried to delete node {0} "
+"which is still in use in way {1}.<br><br>Click <strong>{2}</strong> to "
+"download all parent ways of node {0}.<br>If necessary JOSM will create "
+"conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
+msgstr ""
+"<html>Nahrávanie <strong>neúspešné</strong> pretože sa snažíte zmazať bod "
+"{0} ktorý je stále použitý v ceste {1}.<br><br>Klik <strong>{2}</strong> pre "
+"stiahnutie všetky rodičovské cesty pre bod {0}.<br>Ak nevyhnutne JOSM bude "
+"chcieť vytvoriť konflikty ktoré môžete rozhodnúť v the Conflict Resolution "
+"Dialog.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
+msgid "Node still in use"
+msgstr "Bod je stále v užívaní"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:275
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:292
+#, java-format
+msgid "Warning: error header \"{0}\" did not match with an expected pattern"
+msgstr ""
+"Varovanie: chybná hlavička \"{0}\" nenastala žiadna zhoda s očakávaným vzorom"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:46
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Doplniť krátky komentár k nahrávaným zmenám"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+msgid "Enter an upload comment (min. 3 characters)"
+msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
@@ -7976,39 +8082,151 @@
 msgstr "Neotvárajte súbor zmien"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
+#, fuzzy
+msgid "Upload to a new changeset"
+msgstr "Otvoriť nový zmenový súbor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97
+#, fuzzy
+msgid "Upload to an existing changeset"
+msgstr "Aktualizácia súboru zmien..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98
+#, fuzzy
+msgid "Upload data to an already existing and open changeset"
+msgstr "Nahrať dáta do už otvoreného zmenového súboru"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:142
+msgid "Close changeset after upload"
+msgstr "zatvoriť zmenový súbor po nahratí"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143
+msgid "Select to close the changeset after the next upload"
+msgstr "Vybrať na zavretie zmenový súbor po ďalšom nahratí"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:294
+msgid "Load the list of your open changesets from the server"
+msgstr "Nahrať obsah z vašich otvorených zmenových súborov zo servera"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:312
+msgid "Close the currently selected open changeset"
+msgstr "Zatvoriť práve vybratý otvorený zmenový súbor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
 msgid "<html>Please select the changesets you want to close</html>"
 msgstr "<html>Prosím vyberte zmenový súbor, ktorý chcete zavrieť</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
 msgid "Open changesets"
 msgstr "Otvoriť zmenové súbory"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
 msgid "Close changesets"
 msgstr "Zatvoriť zmenové súbory"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121
 msgid "Close the selected open changesets"
 msgstr "Zavrieť vybrané otvorené zmenové súbory"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144
 msgid "Cancel closing of changesets"
 msgstr "Zrušiť zatváranie zmenových súborov"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38
 msgid "Closing changeset"
 msgstr "Zatváranie súboru zmien"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76
 #, java-format
 msgid "Closing changeset {0}"
 msgstr "zatváranie zmenového súboru {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:142
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:926
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
+#, fuzzy
+msgid ""
+"Warning: failed to put Credential Dialog always on top. Caught security "
+"exception."
+msgstr ""
+"Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
+msgid "Enter credentials for OSM API"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112
+msgid "Enter credentials for HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145
+msgid "Save user and password (unencrypted)"
+msgstr "Uložiť meno a heslo (nešifrovane)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
+#, fuzzy
+msgid "Please enter the user name of your OSM account"
+msgstr "Zadajte uživateľské meno"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
+#, fuzzy
+msgid "Please enter the password name of your OSM account"
+msgstr "Prosím zapíšte značky o vašej stope(trace)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
+#, java-format
+msgid ""
+"<html>Authenticating at the OSM API ''{0}'' failed. Please enter a valid "
+"username and a valid password.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Upozornenie: Heslo sa posiela nešifrované."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254
+msgid "Please enter the user name for authenticating at your proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255
+msgid "Please enter the password for authenticating at your proxy server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
+#, java-format
+msgid ""
+"<html>Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
+"username and a valid password.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
+msgid ""
+"<html>Warning: depending on the authentication method the proxy server uses "
+"the password may be transferred unencrypted.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
+#, fuzzy
+msgid "Authenticate"
+msgstr "Atletika"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
+msgid "Authenticate with the supplied username and password"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
+#, fuzzy
+msgid "Cancel authentication"
+msgstr "Je dosiahnuté spojenie"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924
 msgid "Launch a file chooser to select a file"
 msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:146
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Select filename"
 msgstr "Vybrať meno súboru"
@@ -8077,17 +8295,17 @@
 msgstr "Uložiť vrstvu do ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr "Neuložené zmeny - Uložiť/Nahrať pred ukončením?"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "Neuložené zmeny - Uložiť/Nahrať pred zmazaním?"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
 msgid "Uploading and saving modified layers ..."
 msgstr "Nahrávam a ukladám zmenené vrstvy ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
 #, java-format
 msgid ""
@@ -8107,9 +8325,9 @@
 "zrušte zmeny.<br>Vrstiev s konfliktami:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
 msgid "Unsaved data and conflicts"
 msgstr "Neuložené dáta a konflikty"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
 #, java-format
 msgid ""
@@ -8133,9 +8351,9 @@
 "bez súborov:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
 msgid "Unsaved data and missing associated file"
 msgstr "Neuložené dáta a stratený pričlenený súbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
 #, java-format
 msgid ""
@@ -8160,50 +8378,50 @@
 "zrušte zmeny pre tieto vrstvy.<br>Vrstvy s nezapisovateľnými súbormi:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
 msgid "Unsaved data non-writable files"
 msgstr "Neuložené dáta nezapisovateľných súborov"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
 msgid "Close this dialog and resume editing in JOSM"
 msgstr "Zavrieť tento dialóg a pokračovať v editácii v JOSMe"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Discard and Exit"
 msgstr "Zrušiť a Ukončiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "Ukončiť JOSM bez uloženia. Neuložené zmeny budú stratené."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Discard and Delete"
 msgstr "Zrušiť a Vymazať"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr "Vymazať vrstvy bez uloženia. Neuložený zmeny budú staratené."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Save/Upload and Exit"
 msgstr "Uložiť/Nahrať a Ukončiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr "Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload and Delete"
 msgstr "Uložiť/Nahrať a Vymazať"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr "Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr "Pripravujem vrstvu ''{0}'' pre nahrávanie ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -8213,5 +8431,5 @@
 "úpravami<br>bola zrušená alebo skončila neúspechom.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
 msgid "Incomplete upload and/or save"
 msgstr "Neúplné nahratie a/alebo uloženie"
@@ -8284,40 +8502,400 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:204
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:467
 msgid "Upload"
 msgstr "Nahrať"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:55
+msgid "Update objects"
+msgstr "Aktualizovať objekty"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106
+msgid "Initializing nodes to update ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122
+msgid "Initializing ways to update ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131
+msgid "Initializing relations to update ..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:118
 msgid "Decide how to upload the data and which changeset to use"
 msgstr "Rozhodnite sa ako nahrať dáta a ktoré zmenové dáta použiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:155
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:931
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:979
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1009
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453
 msgid "Tags of new changeset"
 msgstr "Značky pre nový súbor zmien"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:122
 msgid "Apply tags to the changeset data is uploaded to"
 msgstr "Použité značky pre dáta zmenovúho súboru sú nahraté do"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:225
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:126
+#, fuzzy
+msgid "Manage open changesets and select a changeset to upload to"
+msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+#, fuzzy
+msgid "Advanced"
+msgstr "pokročilý (advanced)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:130
+#, fuzzy
+msgid "Configure advanced settings"
+msgstr "Nastavenie dostupných pluginov."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:469
+#, fuzzy, java-format
+msgid "Upload to ''{0}''"
+msgstr "Náhrávanie dát na server z vrstvy ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360
+msgid "Upload Changes"
+msgstr "Nahrať zmeny"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:362
+msgid "Upload the changed primitives"
+msgstr "Nahrať zmenené pôvodné"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:368
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:369
+msgid "Illegal upload comment"
+msgstr "Neplatná poznámka nahrávania"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:378
+msgid "Please enter a valid chunk size first"
+msgstr "Prosím najskôr vložte platnú veľkosť"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:379
+msgid "Illegal chunk size"
+msgstr "Nedovolená veľkosť"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:413
+msgid "Cancel the upload and resume editing"
+msgstr "Zrušiť nahrávanie a pokračovať v editácii"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:455
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr "Značky zo súboru zmien {0}"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:95
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto "
+"pôvodných a zopakovanie nahratia."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:109
+msgid "Preparing primitives to upload ..."
+msgstr "Pripravujem pôvodné na nahratie ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
+msgid "Objects are uploaded to a <strong>new changeset</strong>."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
+#, java-format
+msgid ""
+"Objects are uploaded to the <strong>open changeset</strong> {0} with upload "
+"comment ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
+msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:56
+msgid "The changeset is <strong>left open</strong> after this upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58
+msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80
+#, fuzzy, java-format
+msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
+msgid_plural ""
+"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
+msgstr[0] ""
+"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z <strong>"
+"{1} relácií</strong>.</html>"
+msgstr[1] ""
+"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z <strong>"
+"{1} relácií</strong>.</html>"
+msgstr[2] ""
+"<html>Prosím potvrdiť odstránenie <strong>{0} objektov</strong> z <strong>"
+"{1} relácií</strong>.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86
+#, java-format
+msgid ""
+"Uploading <strong>{0} object</strong> to <strong>1 changeset</strong> using "
+"<strong>1 request</strong>"
+msgid_plural ""
+"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
+"<strong>1 request</strong>"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91
+#, java-format
+msgid ""
+"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
+"<strong>{1} requests</strong>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97
+#, java-format
+msgid ""
+"{0} objects exceed the max. allowed {1} objects in a changeset on the server "
+"''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to "
+"proceed with <strong>multiple changesets</strong>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100
+#, java-format
+msgid ""
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr "Náhrávanie dát na server z vrstvy ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
+msgid "Continue uploading"
+msgstr "Pokračovať v nahrávaní"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82
+msgid "Click to continue uploading to additional new changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86
+msgid "Go back to Upload Dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88
+#, fuzzy
+msgid "Click to return to the Upload Dialog"
+msgstr "Kliknutím zavriete dialóg"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92
+#, fuzzy
+msgid "Abort"
+msgstr "O programe"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94
+#, fuzzy
+msgid "Click to abort uploading"
+msgstr "Kliknúť pre zrušenie spojovania bodov"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99
+#, java-format
+msgid ""
+"The server reported that the current changset was closed.<br>This is most "
+"likely because the changesets size exceeded the max. size<br>of {0} objects "
+"on the server ''{1}''."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
+#, fuzzy, java-format
+msgid "There is {0} object to upload left."
+msgid_plural "There are {0} objects to upload left."
+msgstr[0] "Vyberte objekty na nahratie"
+msgstr[1] "Vyberte objekty na nahratie"
+msgstr[2] "Vyberte objekty na nahratie"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:112
+#, java-format
+msgid ""
+"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
+"changsets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
+"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
+"editing.<br>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123
+#, fuzzy
+msgid "Changeset is full"
+msgstr "Info súboru zmien"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:193
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+"Upozornenie: objekt ''{0}'' je už na servery zmazaný. Vynechávam tento "
+"objekt a opakujem nahrávanie."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr "objekt ''{0}'' je už zmazaný. Vynechávam objekt v nahrávaní."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
+#, java-format
+msgid "Uploading {0} objects ..."
+msgstr "Nahrávam {0} objekty(ov) ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:286
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Ignorujem zachytenú výnimku pretože nahrávanie je zrušené. Výnimka je: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63
+msgid ""
+"<html>Mark modified objects <strong>from the current selection</strong> to "
+"be uploaded to the server.</html>"
+msgstr ""
+"<html>Oznečené zmenené objekty <strong>z aktuálneho výberu</strong> bude "
+"nahratý na server.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73
+msgid ""
+"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
+"server.</html>"
+msgstr ""
+"<html>Označené <strong>lokálne zmazané objekty</strong> budú vymazané na "
+"servery.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
+msgid "Select objects to upload"
+msgstr "Vyberte objekty na nahratie"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
+msgid "Cancel uploading"
+msgstr "Prerušiť nahrávanie"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86
+#, java-format
+msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr ""
+"Varovanie: nečakaná hodnota kľúča ''{0}'' v preferenciách, dostal som ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
+#, fuzzy
+msgid "Please select the upload strategy:"
+msgstr "Prosím vyberte riadok na odstránenie."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343
+msgid "Upload data in one request"
+msgstr "Nahrať údaje v jednej požiadavke"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131
+msgid "Upload data in chunks of objects. Chunk size: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158
+msgid "Upload each object individually"
+msgstr "Nahrať každý objekt individuálne"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. What policy shall be used?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
+#, fuzzy
+msgid "Fill up one changeset and return to the Upload Dialog"
+msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
+msgid "Open and use as many new changesets as necessary"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
+msgid "Upload in one request not possible (too many objects to upload)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
+#, java-format
+msgid ""
+"<html>Can''t upload {0} objects in one request because the<br>max. changeset "
+"size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
+msgid "(1 request)"
+msgstr "(1 požiadavka)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:353
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:354
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362
+msgid "(# requests unknown)"
+msgstr "(# požiadavky neznáme)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:366
+#, java-format
+msgid "({0} request)"
+msgid_plural "({0} requests)"
+msgstr[0] "({0} požiadavka)"
+msgstr[1] "({0} požiadavky)"
+msgstr[2] "({0} požiadaviek)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
+msgid "Illegal chunk size <= 0. Please enter an integer > 1"
+msgstr "Nepovolená veľkosť <= 0. Prosím vložte celé číslo > 1"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:419
+#, java-format
+msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
+msgid "Please enter an integer > 1"
+msgstr "Prosím vložte celé číslo > 1"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422
+#, java-format
+msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
+msgstr "Hodnota ''{0}'' nie je číslo. Prosím vložte celé číslo > 1"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52
 msgid "Objects to add:"
 msgstr "Pridané objekty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58
 msgid "Objects to modify:"
 msgstr "Upravené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:237
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64
 msgid "Objects to delete:"
 msgstr "Odstránené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95
 #, java-format
 msgid "{0} object to add:"
@@ -8327,5 +8905,5 @@
 msgstr[2] "{0} pridaných objektov:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104
 #, java-format
 msgid "{0} object to modify:"
@@ -8335,5 +8913,5 @@
 msgstr[2] "{0} objektov na úpravy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:290
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113
 #, java-format
 msgid "{0} object to delete:"
@@ -8343,217 +8921,37 @@
 msgstr[2] "{0} zmazaných objektov:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:494
-msgid "Upload Changes"
-msgstr "Nahrať zmeny"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:496
-msgid "Upload the changed primitives"
-msgstr "Nahrať zmenené pôvodné"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:502
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
-msgid "Illegal upload comment"
-msgstr "Neplatná poznámka nahrávania"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:513
-#, fuzzy
-msgid "Please enter a valid chunk size first"
-msgstr "Prosím najskôr zadajte požadované koordináty."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:514
-msgid "Illegal chunk size"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:550
-msgid "Cancel the upload and resume editing"
-msgstr "Zrušiť nahrávanie a pokračovať v editácii"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:658
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Doplniť krátky komentár k nahrávaným zmenám"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:660
-msgid "Enter an upload comment (min. 3 characters)"
-msgstr "Doplnte nejaký komentár pre nahrávanie (min. 3 znaky)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:718
-msgid "Open a new changeset"
-msgstr "Otvoriť nový zmenový súbor"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:719
-msgid "Open a new changeset and use it in the next upload"
-msgstr "Otvoriť nový zmenový súbor a použiť ho v ďalšom nahrávaní"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:726
-msgid "Use an open changeset"
-msgstr "Použiť a otvoriť zmenový súbor"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:727
-msgid "Upload data to an already opened changeset"
-msgstr "Nahrať dáta do už otvoreného zmenového súboru"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:767
-msgid "Close changeset after upload"
-msgstr "zatvoriť zmenový súbor po nahratí"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:768
-msgid "Select to close the changeset after the next upload"
-msgstr "Vybrať na zavretie zmenový súbor po ďalšom nahratí"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:997
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1021
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr "Značky zo súboru zmien {0}"
-
-#. putValue(NAME, tr("Reload"));
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1040
-msgid "Load the list of your open changesets from the server"
-msgstr "Nahrať obsah z vašich otvorených zmenových súborov zo servera"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1054
-msgid "Close the currently selected open changeset"
-msgstr "Zatvoriť práve vybratý otvorený zmenový súbor"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:1106
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:333
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:371
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:628
-#, java-format
-msgid "Changeset ID > 0 expected. Got {0}."
-msgstr "Zmenový súbor id > 0 očekávaný. Got {0}"
-
-#. we tried to delete an already deleted primitive.
-#.
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:98
-#, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
-msgstr ""
-"Varovanie: pôvodné ''{0}'' sú už zmazané na servery. Vynechanie týchto "
-"pôvodných a zopakovanie nahratia."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:112
-msgid "Preparing primitives to upload ..."
-msgstr "Pripravujem pôvodné na nahratie ..."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:63
-msgid ""
-"<html>Mark modified objects <strong>from the current selection</strong> to "
-"be uploaded to the server.</html>"
-msgstr ""
-"<html>Oznečené zmenené objekty <strong>z aktuálneho výberu</strong> bude "
-"nahratý na server.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:73
-msgid ""
-"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
-"server.</html>"
-msgstr ""
-"<html>Označené <strong>lokálne zmazané objekty</strong> budú vymazané na "
-"servery.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
-msgid "Select objects to upload"
-msgstr "Vyberte objekty na nahratie"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
-msgid "Cancel uploading"
-msgstr "Prerušiť nahrávanie"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
-msgid "Continue uploading"
-msgstr "Pokračovať v nahrávaní"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86
-#, fuzzy, java-format
-msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr "VAROVANIE: neúspešný pri pokračovaní preferancií na ''{0}''"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:71
-#, fuzzy
-msgid "Upload data in one request"
-msgstr "Nahrať všetky zmeny v jednej požiadavke"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:90
-msgid "Upload data in chunks of objects. Chunk size: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:115
-msgid "Upload each object individually"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:206
-#, fuzzy
-msgid "(1 request)"
-msgstr "Chybná požiadavka"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:208
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:209
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:214
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:217
-msgid "(# requests unknown)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:212
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:221
-#, fuzzy, java-format
-msgid "({0} request)"
-msgid_plural "({0} requests)"
-msgstr[0] "{0} metrov"
-msgstr[1] "{0} metrov"
-msgstr[2] "{0} metrov"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:260
-msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:262
-#, fuzzy
-msgid "Please enter an integer > 1"
-msgstr "Prosím vložte vybraný reťazec"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:265
-#, fuzzy, java-format
-msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
-msgstr "Súbor ''{0}'' nie je zapisovateľný. Prosím zvoľte iné meno súboru."
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "gps poloha bodu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Prispôsobiť kresliacu trasu"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "Použíť globálne nastavenie."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Draw lines between points for this layer."
 msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
 msgid "Do not draw lines between points for this layer."
 msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:220
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
 msgid "Select line drawing options"
 msgstr "Výber nastavenia kreslenej čiary"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:235
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
 msgid "Customize Color"
@@ -8561,5 +8959,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
 #: ../plugins/grid/src/grid/GridLayer.java:162
@@ -8568,5 +8966,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
 #: ../plugins/grid/src/grid/GridLayer.java:163
@@ -8653,5 +9051,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:391
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3190
+#: build/trans_presets.java:3193
 msgid "Description"
 msgstr "Popis"
@@ -8685,10 +9083,10 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:791
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:61
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:790
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8698,12 +9096,12 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:801
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:800
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:824
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:631
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:88
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
@@ -8712,29 +9110,29 @@
 msgstr "Prevedené z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:846
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:872
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:970
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:845
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:969
 msgid "Download from OSM along this track"
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:853
 msgid "Download everything within:"
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:857
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:860
 msgid "Maximum area per request:"
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:864
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:962
 #, java-format
 msgid ""
@@ -8745,9 +9143,9 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1074
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1073
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Vo vrstve nie je žiadna GPX stopa ku ktorej by sa dal pripojiť zvuk."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1243
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -8757,5 +9155,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1250
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -8765,23 +9163,23 @@
 "ich času boli vynechané."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:111
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Údajová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
 msgid "outside downloaded area"
 msgstr "mimo ukladanej oblasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
 #, java-format
 msgid "version {0}"
 msgstr "verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Varovanie: miešanie 0.6 a 0.5 dátového výsledku vo verzii 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
 #, java-format
 msgid "There was {0} conflict detected."
@@ -8791,5 +9189,5 @@
 msgstr[2] "Bolo tam zistených {0} konfliktov."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:339
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
 #, java-format
 msgid ""
@@ -8810,5 +9208,5 @@
 "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
 #, java-format
 msgid ""
@@ -8828,11 +9226,11 @@
 "List Dialog a manuálne ich vyriešte."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:369
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 msgid "Click to close this dialog and continue editing"
 msgstr "Kliknutím zavriete tento dialóga pokračujete v editovaní"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:506
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:511
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:516
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} deleted"
@@ -8842,36 +9240,36 @@
 msgstr[2] "{0} vymazaných"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skladá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 msgid "unset"
 msgstr "neuršený (unset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:523
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
 #, java-format
 msgid "API version: {0}"
 msgstr "Verzia API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:628
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
 msgid "Convert to GPX layer"
 msgstr "Previesť do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:721
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
 msgid "Dataset consistency test"
 msgstr "Test konzistencie dátovej sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:727
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
 msgid "No problems found"
 msgstr "Nezistený žiadny problém"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:730
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
 msgid "Following problems found:"
 msgstr "Bol najdený nasledujúci problém:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:65
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -8881,5 +9279,5 @@
 "závadné.<br>Ak chcete nahrať stopy, pozrite sem:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
 msgctxt "gps"
 msgid "track"
@@ -8889,5 +9287,5 @@
 msgstr[2] "stopy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
 msgid "point"
 msgid_plural "points"
@@ -8896,5 +9294,5 @@
 msgstr[2] "bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
 #, java-format
 msgid "a track with {0} point"
@@ -8904,5 +9302,5 @@
 msgstr[2] "stopy s {0} bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
 #, java-format
 msgid "{0} consists of {1} track"
@@ -8912,5 +9310,5 @@
 msgstr[2] "{0} skladá sa z {1} stôp"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:194
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
 #, java-format
 msgid "{0} point"
@@ -8920,24 +9318,24 @@
 msgstr[2] "{0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:147
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Súbory GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:152
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Súbor {0} je ešte nahratý pod menom \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba pri rozkladaní {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:185
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nemôžem čítať \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:224
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -8949,34 +9347,34 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:242
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
 msgid "Gps time (read from the above photo): "
 msgstr "GPS čas (čítaj nad fotografiou) "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:269
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:277
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
 msgid "I'm in the timezone of: "
 msgstr "Som v časovej zóne: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:340
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
 msgid "No date"
 msgstr "Žiaden dátum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
 msgid "Open an other photo"
 msgstr "Otvoriť inú fotografiu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Synchronizovať čas z fotky a GPS prímača"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
 msgid ""
 "Error while parsing the date.\n"
@@ -8986,70 +9384,158 @@
 "Prosím použite požadovaný formát."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
 msgid "Invalid date"
 msgstr "Neplatný dátum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:449
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
 msgid "<No GPX track loaded yet>"
 msgstr "<Nie je zatiaľ nahratá GPX stopa (track)>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:455
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
 msgid "GPX track: "
 msgstr "GPX stopa(trasa): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:460
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
 msgid "Open another GPX trace"
 msgstr "Otvoriť inú GPX stopu(trasu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:476
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
+msgid ""
+"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+msgid "Auto-Guess"
+msgstr "Auto-Guess"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:517
+msgid "Manual adjust"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:520
+#, fuzzy
+msgid "Override position for: "
+msgstr "Aktualizovať pozíciu pre: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#, java-format
+msgid "Images with geo location in exif data ({0}/{1})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#, java-format
+msgid "Images that are already tagged ({0}/{1})"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:535
+msgid "Show Thumbnail images on the map"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:562
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:498
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:573
 msgid "Offset:"
 msgstr "Vyrovnať(Offset):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:510
-msgid "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-msgstr ""
-"<html>Môžem použiť obrázok z môjho GPS prímača.<br>Môže toto pomôcť?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
-msgid "Update position for: "
-msgstr "Aktualizovať pozíciu pre: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:536
-msgid "All images"
-msgstr "Všetky obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:546
-msgid "Images with no exif position"
-msgstr "Obrázky bez exif pozície"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:556
-msgid "Not yet tagged images"
-msgstr "Zatiaľ neoznačkované obrázky"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:577
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#, fuzzy
+msgid "No gpx selected"
+msgstr "Nič nie je vybraté!"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:656
+#, fuzzy, java-format
+msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track."
+msgstr "Zladené {0} z {1} fotiek k GPX stope."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:674
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:718
 msgid "Correlate images with GPX track"
 msgstr "Zladiť obrázky s GPX stopou(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:675
 msgid "Correlate"
 msgstr "Zladiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:578
-msgid "Auto-Guess"
-msgstr "Auto-Guess"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:592
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:703
+msgid "Invalid timezone"
+msgstr "Neplatné časové pásmo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:711
+msgid "Invalid offset"
+msgstr "Neplatné vyrovnanie (offset)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:719
+#, fuzzy
+msgid "Try Again"
+msgstr "Trasovanie"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:720
+msgid "No images could be matched!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:870
+#, java-format
+msgid "Timezone: {0}"
+msgstr "Časové pásmo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:871
+#, java-format
+msgid "Minutes: {0}"
+msgstr "Minút: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:872
+#, java-format
+msgid "Seconds: {0}"
+msgstr "Sekúnd: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:892
+#, fuzzy, java-format
+msgid "<br>(Time difference of {0} days)"
+msgstr "(Časový rozdiel z {0} dní)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:919
+msgid ""
+"An error occurred while trying to match the photos to the GPX track. You can "
+"adjust the sliders to manually match the photos."
+msgstr ""
+"Chyba nastala zatiaľ čo sa snažím dať fotky do GPX trasy. Musíte nastaviť "
+"posúvač ručne na fotky."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:921
+msgid "Matching photos to track failed"
+msgstr "Priraďovanie fotiek ku stope(track) zlyhalo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:937
+msgid "Adjust timezone and offset"
+msgstr "Nastaviť časové pásmo a vyváženie(offset)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:957
+msgid "The selected photos don't contain time information."
+msgstr "Vybraté fotografie neobsahujú informácie o čase."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:958
+msgid "Photos don't contain time information"
+msgstr "Fotografie neobsahujú informácie o čase."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+msgid ""
+"The selected GPX track doesn't contain timestamps. Please select another one."
+msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:987
+msgid "GPX Track has no time information"
+msgstr "GPX Stopa nemá informáciu o čase."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1079
 msgid "You should select a GPX track"
 msgstr "Môžete vybrať GPX stopu(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:593
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1080
 msgid "No selected GPX track"
 msgstr "Nevybratá GPX stopa(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:605
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1254
 #, java-format
 msgid ""
@@ -9060,9 +9546,5 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:606
-msgid "Invalid timezone"
-msgstr "Neplatné časové pásmo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:618
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1325
 #, java-format
 msgid ""
@@ -9073,136 +9555,56 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:619
-msgid "Invalid offset"
-msgstr "Neplatné vyrovnanie (offset)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:659
-#, java-format
-msgid "Found {0} matches of {1} in GPX track {2}"
-msgstr "Najdené {0} zhody z {1} v GPX stope {2}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:660
-msgid "GPX Track loaded"
-msgstr "Nahratá GPX stopa(trasa)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:695
-msgid "The selected photos don't contain time information."
-msgstr "Vybraté fotografie neobsahujú informácie o čase."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:696
-msgid "Photos don't contain time information"
-msgstr "Fotografie neobsahujú informácie o čase."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:730
-msgid ""
-"The selected GPX track doesn't contain timestamps. Please select another one."
-msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:731
-msgid "GPX Track has no time information"
-msgstr "GPX Stopa nemá informáciu o čase."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:776
-#, java-format
-msgid "Timezone: {0}"
-msgstr "Časové pásmo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:777
-#, java-format
-msgid "Minutes: {0}"
-msgstr "Minút: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:778
-#, java-format
-msgid "Seconds: {0}"
-msgstr "Sekúnd: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:795
-#, java-format
-msgid "Matched {0} of {1} photos to GPX track."
-msgstr "Zladené {0} z {1} fotiek k GPX stope."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:798
-#, java-format
-msgid "(Time difference of {0} days)"
-msgstr "(Časový rozdiel z {0} dní)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:805
-#, java-format
-msgid "Offset between track and photos: {0}m {1}s"
-msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
-msgid ""
-"An error occurred while trying to match the photos to the GPX track. You can "
-"adjust the sliders to manually match the photos."
-msgstr ""
-"Chyba nastala zatiaľ čo sa snažím dať fotky do GPX trasy. Musíte nastaviť "
-"posúvač ručne na fotky."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:869
-msgid "Matching photos to track failed"
-msgstr "Priraďovanie fotiek ku stope(track) zlyhalo"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
-msgid "Adjust timezone and offset"
-msgstr "Nastaviť časové pásmo a vyváženie(offset)"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
-msgid "Default Values"
-msgstr "Východzie hodnoty"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Získavam GPS polohu z EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Začínam prehľadávať adresár"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:135
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr "Niektorý z vybratých súborov bol prázdny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:141
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:144
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Čítať fotky..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:156
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Čítam {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemôžem získať cestu pre adresár {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:210
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prehľadávam adresár {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nájdený prázdny súbor v adresári {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:218
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba pri získavaní súború z adresára {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:272
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS súradnicami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:352
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:294
 msgid "Correlate to GPX"
 msgstr "Zladiť GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:313
 msgid "image"
 msgid_plural "images"
@@ -9211,52 +9613,100 @@
 msgstr[2] "obrázkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:371
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:314
 #, java-format
 msgid "{0} were found to be gps tagged."
 msgstr "{0} boli nájdené s gps značkami."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:578
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
+msgid "Delete image file from disk"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:581
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0}  from disk?<p>The image file will be "
+"permanently lost!"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:584
+#, fuzzy
+msgid "Always delete and don't show this dialog again"
+msgstr "Vždy posúvať a nezobrazovať znovu dialóg"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:607
+#, fuzzy
+msgid "Image file could not be deleted."
+msgstr "Súbor nie je možné nájsť."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
 msgid "No image"
 msgstr "Bez obrázka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:451
 #, java-format
 msgid "Loading {0}"
 msgstr "Nahrávam {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:454
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:481
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:480
 #, java-format
 msgid "Error on file {0}"
 msgstr "Chyba v súbore {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:53
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Display geotagged images"
-msgstr "Zobraziť fotky s geoznačkami"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Predchádzajúci"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:89
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
+#, fuzzy
+msgid "Show previous Image"
+msgstr "Predchádzajúci obrázok"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
+#, fuzzy, java-format
+msgid "Geoimage: {0}"
+msgstr "Internetová stránka: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
 msgid "Remove photo from layer"
 msgstr "Odstraniť fotku z vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
+#, fuzzy
+msgid "Delete File from disk"
+msgstr "Zmazať z relácie (zo vzťahu"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Nasledujúci"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
+#, fuzzy
+msgid "Show next Image"
+msgstr "Nasledujúci obrázok"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
 msgid "Center view"
 msgstr "Stredový pohľad"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
 msgid "Zoom best fit and 1:1"
 msgstr "Najvhodnejšie zväčšenie 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:186
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:134
+msgid "Move dialog to the side pane"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:245
 #, java-format
 msgid ""
@@ -9267,5 +9717,5 @@
 "Výška: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:189
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:248
 #, java-format
 msgid ""
@@ -9374,4 +9824,12 @@
 msgstr "Chyba zobrazovania URL"
 
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:117
+msgid "Illegal dash pattern, values must be positive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:123
+msgid "Illegal dash pattern, at least one value must be > 0"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
@@ -9596,7 +10054,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/TerracerAction.java:412
-#: ../plugins/terracer/src/terracer/TerracerAction.java:430
-#: ../plugins/terracer/src/terracer/TerracerAction.java:494
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
 msgid "All"
 msgstr "Všetko"
@@ -9665,6 +10122,6 @@
 #: build/trans_presets.java:1010 build/trans_presets.java:1022
 #: build/trans_presets.java:1032 build/trans_presets.java:1041
-#: build/trans_presets.java:1050 build/trans_presets.java:1451
-#: build/trans_presets.java:1524
+#: build/trans_presets.java:1050 build/trans_presets.java:1444
+#: build/trans_presets.java:1510
 msgid "Bicycle"
 msgstr "Bicykel"
@@ -10064,31 +10521,94 @@
 msgstr "Projekcia {0} nemohla byť aktivovaná. Bude použitá projecia Mercator"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:35
-msgid "Enable proxy server"
-msgstr "Používať proxy server"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:38
-msgid "Anonymous"
-msgstr "Anonymný"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:71
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:146
+#, fuzzy
+msgid "Host:"
+msgstr "Ubytovňa"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:102
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:153
+#, fuzzy
+msgctxt "server"
+msgid "Port:"
+msgstr "Port:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:114
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:129
+#, fuzzy
+msgid "Password:"
+msgstr "Heslo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:189
+msgid "No proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:202
+msgid "Use standard system settings"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:204
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:216
+msgid "Manually configure a HTTP proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:233
+msgid "Use a SOCKS proxy"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:273
+msgid ""
+"Warning: JOSM is configured to use proxies from the system setting, but the "
+"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:298
 msgid "Proxy Settings"
 msgstr "Nastavenia proxy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:73
-msgid "Proxy server host"
-msgstr "Adresa proxy servera"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:75
-msgid "Proxy server port"
-msgstr "Port proxy servera"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:78
-msgid "Proxy server username"
-msgstr "Užívatelské meno pre proxy"
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProxyPreferences.java:80
-msgid "Proxy server password"
-msgstr "Heslo pre proxy"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:59
+msgid "The base URL for the OSM server (REST API)"
+msgstr "Základná URL pre OSM server (REST API)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:60
+msgid "Login name (e-mail) to the OSM account."
+msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:61
+msgid ""
+"Login password to the OSM account. Leave blank to not store any password."
+msgstr ""
+"Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:63
+msgid "Base Server URL"
+msgstr "Základná Serverová URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:65
+msgid "OSM username (e-mail)"
+msgstr "OSM užívateľské meno (e-mail)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:67
+msgid "OSM password"
+msgstr "OSM heslo"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+msgid ""
+"<html>WARNING: The password is stored in plain text in the preferences file."
+"<br>The password is transferred in plain text to the server, encoded in the "
+"URL.<br><b>Do not use a valuable Password.</b></html>"
+msgstr ""
+"<html>Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení."
+"<br>Heslo je  prenesené v jednoduchom texte na server, kódované v URL."
+"<br><b>Nepoužite vzácne Heslo.</b></html>"
 
 #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
@@ -10393,5 +10913,5 @@
 msgstr "<mnohonásobný>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:402
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:406
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
@@ -10402,13 +10922,13 @@
 msgstr[2] "Odstrániť staré kľúče z {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:134
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:138
 msgid "Add a new tag"
 msgstr "Pridať novú značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:159
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:163
 msgid "Delete the selection in the tag table"
 msgstr "Zmazať výber v tabuľke značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:450
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -10416,18 +10936,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:472
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
 msgid "Optional Attributes:"
 msgstr "Voliteľné atribúty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:562
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
 msgid "closedway"
 msgstr "uzavratá cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:567
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznány type (druh): {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:646
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -10438,16 +10958,16 @@
 msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:654
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba rozkladania(parsovania) {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:684
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementy typu(druhu) {0} sú podporované."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:725
-#: ../plugins/terracer/src/terracer/TerracerAction.java:98
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
+#: ../plugins/terracer/src/terracer/TerracerAction.java:76
 #, java-format
 msgid "Change {0} object"
@@ -10457,18 +10977,18 @@
 msgstr[2] "Zmeniť {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:728
-#: ../plugins/terracer/src/terracer/TerracerAction.java:100
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
+#: ../plugins/terracer/src/terracer/TerracerAction.java:79
 msgid "Nothing selected!"
 msgstr "Nič nie je vybraté!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:730
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
 msgid "Selection unsuitable!"
 msgstr "Nevhodný výber!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:738
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
 msgid "Apply Preset"
 msgstr "Použiť predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:813
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
 msgid "Change Properties"
 msgstr "Zmeniť vlastnosti"
@@ -10497,4 +11017,13 @@
 msgstr "Sťahujem body {0} až {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
+#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
+#, fuzzy
+msgid ""
+"Warning: illegal value of attribute '{0}'' of element ''{1}'' in server "
+"capabilities. Got ''{2}"
+msgstr ""
+"Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}"
+
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:110
@@ -10512,12 +11041,71 @@
 "Dostal som ''{0}''"
 
-#. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
-msgid "NullPointerException, possibly some missing tags."
-msgstr "NullPointerException, pravdepodobne chýbajú niektoré značky (tagy)."
-
-#: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:69
-msgid "Preparing data..."
-msgstr "Pripravujem dáta..."
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
+#, fuzzy, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''. "
+"Proxy won't be used."
+msgstr ""
+"neočakávaný formát novej verzie zo zmenených pôvodných ''{0}'', dostáva "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:88
+#, java-format
+msgid ""
+"Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:101
+#, java-format
+msgid "Warning: no preference ''{0}'' found. Will use no proxy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:106
+#, fuzzy, java-format
+msgid ""
+"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
+"use no proxy."
+msgstr ""
+"Varovanie: nečakaná hodnota kľúča ''{0}'' v preferenciách, dostal som ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:117
+#, java-format
+msgid ""
+"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
+"''{1}''. Proxy won't be used"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:128
+#, java-format
+msgid ""
+"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
+"''{1}''. Proxy won't be used"
+msgstr ""
+
+#. Just log something. The network stack will also throw an exception which will be caught
+#. somewhere else
+#.
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:138
+#, java-format
+msgid ""
+"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:147
+msgid ""
+"Warning: the JVM is not configured to lookup proxies from the system "
+"settings. The property ''java.net.useSystemProxies'' was missing at startup "
+"time. Won't use a proxy."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
+#, fuzzy
+msgid "Parsing response from server..."
+msgstr "Pýtam sa na meno servera ..."
+
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169
+#, fuzzy, java-format
+msgid "Unexpected XML element with name ''{0}''"
+msgstr "neočakávané číslo stĺpca {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
@@ -10620,10 +11208,10 @@
 msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:239
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
 #, java-format
 msgid "Unknown mode {0}."
 msgstr "Neznámy mód {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:116
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
 #, java-format
 msgid "No primitive with id {0} in local dataset. Can't infer primitive type."
@@ -10632,6 +11220,6 @@
 "pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:309
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:333
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:332
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:30
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:84
@@ -10641,20 +11229,20 @@
 msgstr "Sťahujem OSM údaje..."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
 msgstr "Priniesť(Fetching) bod s id {0} z ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
 msgstr "Priniesť(Fetching) cestu s id {0} z ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
 msgstr "Priniesť(Fetching) reláciu s id {0} z ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:369
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
@@ -10662,20 +11250,20 @@
 "Server odpovedal stretol sa s reakcoiu kódu 404 pre id {0}. Vynechanie."
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
 msgstr "Priniesť(Fetching) balíček bodov z {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
 msgstr "Priniesť(Fetching) balíček ciest z {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:413
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
 msgstr "Priniesť(Fetching) balíček relácií z {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:424
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423
 msgid ""
 "Server replied with response code 404, retrying with an individual request "
@@ -10685,11 +11273,11 @@
 "pre každý pôvodný"
 
-#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:450
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449
+#, java-format
 msgid "Downloading {0} object from ''{1}''"
 msgid_plural "Downloading {0} objects from ''{1}''"
-msgstr[0] "Sťahovanie relácie ''{0}''"
-msgstr[1] "Sťahovanie relácie ''{0}''"
-msgstr[2] "Sťahovanie relácie ''{0}''"
+msgstr[0] "Sťahovanie {0} objektu z ''{1}''"
+msgstr[1] "Sťahovanie {0} objektov z ''{1}''"
+msgstr[2] "Sťahovanie {0} objektov z ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -10726,10 +11314,10 @@
 msgstr "NMEA import zlyhal!"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:82
-#, java-format
-msgid "Preference ''{0}'' missing. Can't initialize OsmApi."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:81
+#, fuzzy, java-format
+msgid "Preference ''{0}'' missing. Can''t initialize OsmApi."
 msgstr "preferencie ''{0}'' chýbajú. Nemôžem inicializovať OsmApi"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:161
 msgid "This version of JOSM is incompatible with the configured server."
 msgstr ""
@@ -10737,25 +11325,24 @@
 "nastaveniach."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:164
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:162
+#, java-format
 msgid ""
 "It supports protocol version 0.6, while the server says it supports {0} to "
 "{1}."
 msgstr ""
-"Podporuje protokol verzií 0.5 a 0.6, zatiaľ čo server hlási podporu {0} to "
-"{1}."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:168
+"Podporuje protokol verzie 0.6, zatiaľ čo server uvádza podporu {0} do {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166
 #, java-format
 msgid "Communications with {0} established using protocol version {1}."
 msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:243
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:306
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
 #, java-format
 msgid "Unexpected format of ID replied by the server. Got ''{0}''."
 msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:263
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:274
 #, java-format
 msgid ""
@@ -10765,66 +11352,77 @@
 "''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:298
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
 msgid "Creating changeset..."
 msgstr "Vytváranie súboru zmien..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:319
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "Úspešne otvorený súbor zmien {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:335
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:657
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
+msgstr "Zmenový súbor id > 0 očekávaný. Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346
 msgid "Updating changeset..."
 msgstr "Aktualizácia súboru zmien..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:337
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "Aktualizácia súboru zmien {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:373
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Zatváranie súboru zmien..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:394
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:408
 msgid "No changeset present for diff upload."
 msgstr "Nenachádza sa tu súbor zmien pre diff nahratie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:401
-msgid "Preparing..."
-msgstr "Pripravujem..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
-msgid "Uploading..."
-msgstr "Nahrávam..."
-
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:415
+#, fuzzy
+msgid "Preparing upload request..."
+msgstr "Začínam nahrávať požiadavku ..."
+
+#. Upload to the server
+#.
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:423
+#, fuzzy, java-format
+msgid "Uploading {0} objects..."
+msgstr "Nahrávam {0} objekty(ov) ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:444
 msgid "Waiting 10 seconds ... "
 msgstr "Čakanie 10 sekúnd ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:426
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:447
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "Začiatok opakovania {0} z {1} v {2} sekunde ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:434
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:455
 msgid "OK - trying again."
 msgstr "OK - skúšam znovu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:510
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:531
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Spúšťam opakovanie {0} z {1}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:600
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:629
 msgid "Current changeset is null. Can't upload data."
 msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:602
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:631
 #, java-format
 msgid "ID of current changeset > 0 required. Current ID is {0}."
 msgstr "ID z aktuálneho zmenového súboru > 0 požadovaný. Aktuálne ID je {0}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:630
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:659
 #, java-format
 msgid "Open changeset expected. Got closed changeset with id {0}."
@@ -10851,4 +11449,14 @@
 msgid "Invalid bz2 file."
 msgstr "Poškodený bz2 súbor."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75
+msgid "Prolog of OsmChange document already written. Please write only once."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:111
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:122
+msgid "Prolog of OsmChange document not written yet. Please write frst."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
@@ -10859,5 +11467,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:116
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:131
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:194
 #, java-format
 msgid "Missing mandatory attribute ''{0}''."
@@ -10884,5 +11492,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:177
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:190
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
@@ -10890,5 +11498,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:184
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:197
 #, java-format
 msgid "Unsupported version: {0}"
@@ -10901,5 +11509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:327
 #, java-format
 msgid "Illegal value for attribute ''uid''. Got ''{0}''."
@@ -10910,61 +11518,6 @@
 msgstr "rozkladám obsah zo zmenového súboru..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
-msgid "Incorrect password or username."
-msgstr "Nesprávne heslo alebo meno."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:177
-msgid "Warning: The password is transferred unencrypted."
-msgstr "Upozornenie: Heslo sa posiela nešifrované."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:181
-msgid "Save user and password (unencrypted)"
-msgstr "Uložiť meno a heslo (nešifrovane)"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:187
-msgid "Enter Password"
-msgstr "Zadajte heslo"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:188
-msgid "Login"
-msgstr "Prihlásenie"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
-msgid "The base URL for the OSM server (REST API)"
-msgstr "Základná URL pre OSM server (REST API)"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
-msgid "Login name (e-mail) to the OSM account."
-msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:253
-msgid ""
-"Login password to the OSM account. Leave blank to not store any password."
-msgstr ""
-"Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:254
-msgid "Base Server URL"
-msgstr "Základná Serverová URL"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:256
-msgid "OSM username (e-mail)"
-msgstr "OSM užívateľské meno (e-mail)"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:258
-msgid "OSM password"
-msgstr "OSM heslo"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:260
-msgid ""
-"<html>WARNING: The password is stored in plain text in the preferences file."
-"<br>The password is transferred in plain text to the server, encoded in the "
-"URL.<br><b>Do not use a valuable Password.</b></html>"
-msgstr ""
-"<html>Varovanie: Heslo je uložené v jednoduchom texte v súbore nastavení."
-"<br>Heslo je  prenesené v jednoduchom texte na server, kódované v URL."
-"<br><b>Nepoužite vzácne Heslo.</b></html>"
-
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
+#: ../core/src/org/openstreetmap/josm/tools/XmlObjectParser.java:68
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -11065,5 +11618,12 @@
 msgstr "Súbor \"{0}\" neexistuje"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:208
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:110
+#, java-format
+msgid ""
+"Warning: ignoring changeset id {0} for new object with external id {1} and "
+"internal id {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
 #, java-format
 msgid ""
@@ -11074,30 +11634,30 @@
 "minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:244
 msgid "Found XML element <nd> not as direct child of element <way>."
 msgstr ""
 "vytvoriť XML element <nd> element nie je ako priame dieťa z elementu <way>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:236
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:249
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
 msgstr "Chýba povinná vlastnosť ''{0}'' na <nd> z cesty {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
 msgstr "Neplatná hodnota vlastnosti ''ref'' z elementu <nd>. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:259
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:272
 msgid "Found XML element <member> not as direct child of element <relation>."
 msgstr ""
 "Vytvoriť XML element <člen> nie je ako priame dieťa z elementu <relácia>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:278
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}."
 msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:270
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:283
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
@@ -11105,10 +11665,10 @@
 "Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:287
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}."
 msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:277
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:290
 #, java-format
 msgid ""
@@ -11117,19 +11677,19 @@
 "Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:284
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletné <member> špecifikácie s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:296
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:309
 #, java-format
 msgid "Undefined element ''{0}'' found in input stream. Skipping."
 msgstr "Nedefinovaný prvok ''{0}'' najdený vo vstupných dátach. Vynechávam."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:324
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:337
 msgid "Illegal object with ID=0."
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:350
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:354
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:367
 #, java-format
 msgid ""
@@ -11140,8 +11700,8 @@
 
 #. default version in 0.5 files for existing primitives
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:364
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:378
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:374
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:377
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:391
 #, java-format
 msgid ""
@@ -11153,25 +11713,42 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:369
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:382
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}."
 msgstr "Neznáma, alebo nepodporovaná API verzia. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:375
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:388
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
 msgstr "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:400
+#. for a new primitive we just log a warning
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428
+#, fuzzy, java-format
+msgid ""
+"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
+"Resetting to 0."
+msgstr ""
+"Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}"
+
+#. for an existing primitive this is a problem
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:422
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:432
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''changeset''. Got {0}."
+msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:441
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr "Chýba povinná vlastnosť ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:446
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
 msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:428
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:468
 #, java-format
 msgid ""
@@ -11180,5 +11757,5 @@
 "Cesta s externou ID ''{0}'' obsahuje chýbajúci bod s externou ID ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:447
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:486
 #, java-format
 msgid ""
@@ -11189,5 +11766,5 @@
 "chýbajúci v nahratých dátach a je preto neúplná tiež."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:496
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 #, java-format
 msgid ""
@@ -11195,5 +11772,5 @@
 msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
 #, java-format
 msgid ""
@@ -11204,13 +11781,13 @@
 "''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:557
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
 msgid "Prepare OSM data..."
 msgstr "Pripravujem OSM údaje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:558
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:593
 msgid "Parsing OSM data..."
 msgstr "Rozložiť OSM dáta..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:563
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:598
 msgid "Preparing data set..."
 msgstr "Pripravujem dátový súbor ..."
@@ -11233,20 +11810,33 @@
 msgstr "Sťahovanie odkazovaných relácií ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
 msgid "Reading changesets..."
 msgstr "Načitávam zmenové súbory..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:63
 msgid "Downloading changesets ..."
 msgstr "Sťahujem zmenové súbory..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
 #, java-format
 msgid "Reading changeset {0} ..."
 msgstr "Načitávam zmenový súbor {0} ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:97
 #, java-format
 msgid "Downloading changeset {0} ..."
+msgstr "Sťahujem zmenový súbor {0} ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:127
+#, fuzzy, java-format
+msgid "Downloading {0} changeset ..."
+msgid_plural "Downloading {0} changesets ..."
+msgstr[0] "Sťahujem zmenové súbory..."
+msgstr[1] "Sťahujem zmenové súbory..."
+msgstr[2] "Sťahujem zmenové súbory..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:142
+#, fuzzy, java-format
+msgid "({0}/{1}) Downloading changeset {0} ..."
 msgstr "Sťahujem zmenový súbor {0} ..."
 
@@ -11266,7 +11856,7 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:42
 #: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:62
-#, fuzzy, java-format
+#, java-format
 msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-msgstr "neočakávaná hodnota parametra\"index\". Got {0}"
+msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
@@ -11275,9 +11865,5 @@
 msgstr "Neúspešné nadviazanie spojenia do API {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
-msgid "Error: failed to add authentication credentials to the connection."
-msgstr "Chyba: neúspešné pridanie poverovacej autentifikácie pre spojenie."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:86
 msgid ""
 "Couldn't connect to the OSM server. Please check your internet connection."
@@ -11331,21 +11917,25 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
-#, fuzzy, java-format
+#, java-format
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
-msgstr "neočakávaná hodnota parametra\"index\". Got {0}"
+msgstr "Hodnota >0 očakávaná pre parameter ''{0}'', dostal som {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
-#, fuzzy
 msgid "Starting to upload in chunks..."
-msgstr "Začínam nahrávať požiadavku ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:151
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
+#, java-format
 msgid "({0}/{1}) Uploading {2} objects..."
-msgstr "Nahrávam {0} objekty(ov) ..."
+msgstr "({0}/{1}) Nahrávanie {2} objektov..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187
 msgid "Uploading data ..."
 msgstr "Nahrávam dáta ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
+#, fuzzy
+msgid "Unexpected id 0 for osm primitive found"
+msgstr "Vymazané alebo presunuté pôvodné"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:44
@@ -11388,12 +11978,12 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:146
-#, fuzzy, java-format
+#, java-format
 msgid "Delete old plugin {0}"
-msgstr "Zmazať {1} {0}"
+msgstr "Zmazať staršie pluginy {0}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:153
-#, fuzzy, java-format
+#, java-format
 msgid "Delete old plugin file {0}"
-msgstr "Chyba pri mazaní súboru pluginu: {0}"
+msgstr "Zmazať staršie súbory pluginov {0}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:166
@@ -11422,5 +12012,5 @@
 #, java-format
 msgid "Plugin {0} is no longer necessary and has been deactivated."
-msgstr ""
+msgstr "Plugin {0} nie je viac potrebný a má byť deaktivovaný."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:84
@@ -11541,9 +12131,9 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:392
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:172
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:171
 msgid "no description available"
 msgstr "Popis nedostupný"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:174
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:173
 msgid "More details"
 msgstr "Viac detailov"
@@ -11687,4 +12277,19 @@
 msgstr "Stretli ste sa s chybou v JOSMe"
 
+#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:23
+#, fuzzy, java-format
+msgid "Expected unique id > 0 for primitive id, got {0}"
+msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:28
+#, fuzzy, java-format
+msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
+msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/CheckParameterUtil.java:48
+#, fuzzy, java-format
+msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
+msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}"
+
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:39
 #, java-format
@@ -12037,6 +12642,6 @@
 
 #: ../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
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
 msgid "Upload Traces"
 msgstr "Nahrať Stopy (Traces)"
@@ -12122,5 +12727,5 @@
 msgstr "Nahrávam GPX stopu (track)"
 
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:34
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
 msgid "Uploads traces to openstreetmap.org"
 msgstr "Nahrať Stopy (Traces) na openstreetmap.org"
@@ -12131,5 +12736,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2285
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -12145,11 +12750,8 @@
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/TerracerAction.java:414
 msgid "Odd"
 msgstr "Nepárny (odd)"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/TerracerAction.java:413
-#: ../plugins/terracer/src/terracer/TerracerAction.java:437
 msgid "Even"
 msgstr "Vyrovnať (even)"
@@ -12160,24 +12762,20 @@
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#, fuzzy
 msgid "Numeric"
-msgstr "Číslo"
+msgstr "Číselný"
 
 #. NOTE: The following 2 arrays must match in number of elements and position
 #. Tag values for map
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
-#, fuzzy
 msgid "Actual"
-msgstr "prírodné (natural)"
+msgstr "Aktuálny"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
-#, fuzzy
 msgid "Estimate"
-msgstr "miesto (blízke okolie)"
+msgstr "Odhad"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
-#, fuzzy
 msgid "Potential"
-msgstr "Požičovňa"
+msgstr "Potenciál"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190
@@ -12195,7 +12793,6 @@
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216
-#, fuzzy
 msgid "Increment:"
-msgstr "vnútorná časť (inner segment)"
+msgstr "Prírastok:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220
@@ -12209,9 +12806,9 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226
 msgid "Accuracy:"
-msgstr ""
+msgstr "Presnosť:"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
 msgid "Convert way to individual house numbers."
-msgstr ""
+msgstr "Zmeniť cestu na samostatné čísla domov."
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
@@ -12261,7 +12858,6 @@
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
-#, fuzzy
 msgid "Expected valid number for address increment"
-msgstr "Očakávané nepárne čísla pre adresy"
+msgstr "Očakávané platné číslo prírastka čísla adresy"
 
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
@@ -12312,5 +12908,5 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:387
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:389
 msgid "Select Feuille"
 msgstr "Vybrať Feuille"
@@ -12376,21 +12972,21 @@
 #. this below is a temporary workaround to fix the "always on top" issue
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:366
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:368
 msgid "Select commune"
 msgstr "Vybrať hranice obce(samosprávy)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:355
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:357
 msgid "Choose from..."
 msgstr "Vybrať z..."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:143
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:144
 msgid "Cadastre"
 msgstr "Cadastre"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:152
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:153
 msgid "Auto sourcing"
 msgstr "Automatické získavanie"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:207
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
 msgid ""
 "Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
@@ -12402,13 +12998,13 @@
 "Budete si želať obnoviť F11 pre grabovanie?"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:210
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:211
 msgid "Restore grab shortcut F11"
 msgstr "Obnoviť klávesovú skratku pre grabovanie F11"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:215
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:216
 msgid "JOSM is stopped for the change to take effect."
 msgstr "JOSM ja zastavený aby zmeny mohli byť prevedené"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:277
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:278
 #, java-format
 msgid ""
@@ -12435,18 +13031,18 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:38
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:183
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:185
 msgid "Disable image cropping during georeferencing."
 msgstr ""
 "Vypnuté orezávanie obrázkov pri určovaní zemepisnej polohy (georeferencingu)."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:57
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
 msgid "Enable automatic caching."
 msgstr "Povoliť automatické cachovanie."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:60
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:62
 msgid "Max. cache size (in MB)"
 msgstr "Maximálna veľkost cache (v MB)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
 msgid ""
 "A special handler of the French cadastre wms at www.cadastre.gouv."
@@ -12463,18 +13059,18 @@
 "<BR>predtým, ako nahráte nejaké dáta vytvorené  týmto pluginom."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:77
 msgid "French cadastre WMS"
 msgstr "French cadastre WMS (Francúzsky kataster WMS)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:79
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:81
 msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
 msgstr "<html>Hodnota kľúča \"zdroj\" keď je automatický zdroj zapnutý</html>"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:82
 msgid "Source"
 msgstr "Zdroj"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:86
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:216
 msgid ""
 "Replace the original white background by the backgound color defined in JOSM "
@@ -12484,5 +13080,5 @@
 "JOSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:91
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
 msgid ""
 "Invert the original black and white colors (and all intermediate greys). "
@@ -12492,53 +13088,50 @@
 "pre texty na tmavých pozadiach."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:101
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:103
 msgid "Allows multiple layers stacking"
 msgstr "Povoliť vyrovnanie viacnásobných vrstiev"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:108
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
 msgstr "Nastaviť priehľadnosť WMS vrstiev"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:119
 msgid "Draw a rectangle around downloaded data from WMS server."
 msgstr "Kresliť obdĺžnik okolo sťahovaných dát z WMS servera."
 
 #. the vectorized images multiplier
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:124
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:126
 msgid "Vector images grab multiplier:"
 msgstr "Zachytávač vektorových obrázkov multiplikátor:"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:139
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:141
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:145
 msgid "Grab smaller images (higher quality but use more memory)"
 msgstr ""
 "Zachytávanie menších obrázkov ( vyššia kvalita, ale použije viac pamäte)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:149
 msgid "Fixed size square (default is 100m)"
 msgstr "Pevná veľkosť štvorcov (východzia 100m)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:169
 msgid "Fixed size (from 25 to 1000 meters)"
 msgstr "Pevná veľkosť v rozmedzí (od 25 do 1000 metrov)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:176
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:178
 msgid "Raster images grab multiplier:"
 msgstr "Zachytávač rastrových obrázkov multiplikátor:"
 
 #. the crosspiece display
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:186
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:188
 msgid "Display crosspieces:"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:217
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:222
 msgid "Oldest files are automatically deleted when this size is exceeded"
 msgstr "Staré súbory sú automaticky zmazané, keď táto veľkosť je prekročená"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:80
-msgid "Auto-tag source added:"
-msgstr "Dodatočný zdroj automatických-značiek:"
-
-#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:85
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88
 msgid "Add \"source=...\" to elements?"
 msgstr "Pridať \"source=...\" do položiek?"
@@ -12760,5 +13353,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2338
 msgid "Location"
 msgstr "Umiestnenie"
@@ -12961,5 +13554,5 @@
 
 #: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:118
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:117
 msgid "No data loaded."
 msgstr "Neboli načítané žiadne dáta."
@@ -12981,9 +13574,9 @@
 msgstr "Konvertovať do GPX vrstvy s neznámym časom"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:46
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:47
 msgid "edit gpx tracks"
 msgstr "upraviť gpx stopy(tracks)"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:85
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:86
 msgid "EditGpx"
 msgstr "UpraviťGpx"
@@ -13372,7 +13965,7 @@
 #. <icon src="misc/no_icon.png"/>
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
-#: build/trans_presets.java:2348 build/trans_style.java:990
-#: build/trans_style.java:1007 build/trans_style.java:1023
-#: build/trans_style.java:3408 build/trans_style.java:3416
+#: build/trans_presets.java:2337 build/trans_style.java:961
+#: build/trans_style.java:978 build/trans_style.java:994
+#: build/trans_style.java:3415 build/trans_style.java:3423
 msgid "water"
 msgstr "voda"
@@ -13533,19 +14126,19 @@
 msgstr "Nemôžem získať obrázok"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:124
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:145
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146
 msgid "Connecting"
 msgstr "Pripájam sa"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:210
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:211
 msgid "Connected"
 msgstr "Pripojené"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:224
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:251
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:225
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:252
 msgid "Not connected"
 msgstr "Nepripojený"
 
-#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:239
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:240
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
@@ -13584,32 +14177,32 @@
 msgstr "LiveGPS layer"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:44
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:54
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:58
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:90
 msgid "Capture GPS Track"
 msgstr "Nahrať GPS Stopu"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:43
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
 msgid "Connect to gpsd server and show current position in LiveGPS layer."
 msgstr "Pripojiť to gpsd server a ukázať aktuálnu polohu v LiveGPS vrstve."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72
 msgid "Center Once"
 msgstr "Vycentrovať (Center Once)"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:55
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
 msgid "Center the LiveGPS layer to current position."
 msgstr "Stred LiveGPS vrstvy v aktuálnej polohe."
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86
 msgid "Auto-Center"
 msgstr "Automatický stred (Auto-Center)"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88
 msgid "Continuously center the LiveGPS layer to current position."
 msgstr "Nepretržite stred LiveGPS vrstvy do aktuálnej polohy"
 
-#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:101
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:119
 msgid "LiveGPS"
 msgstr "LiveGPS"
@@ -13660,9 +14253,9 @@
 msgstr "Nedá sa kresliť mimo svet."
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:20
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:21
 msgid "measurement mode"
 msgstr "Režim merania"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:37
 msgid "Measurements"
 msgstr "Meranie"
@@ -13701,5 +14294,5 @@
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:142
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:141
 #: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:19
 msgid "Create multipolygon"
@@ -13710,13 +14303,13 @@
 msgstr "Vytvoriť multipolygón."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:86
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:85
 msgid "One of the selected ways is already part of another multipolygon."
 msgstr "Jedna z vybraných ciest už je súčasťou iného multipolygónu."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:104
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:103
 msgid "Multipolygon must consist only of closed ways."
 msgstr "Multipolygón sa musí skladať iba z uzavretých ciest."
 
-#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:123
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:122
 msgid "You must select at least two ways."
 msgstr "Musíte vybrať aspoň dve cesty."
@@ -13868,5 +14461,5 @@
 msgstr "Spúšťací súbor Firefoxu"
 
-#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:62
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:63
 msgid "PicLayer"
 msgstr "PicLayer"
@@ -13961,5 +14554,5 @@
 
 #. TODO Use constructor with shortcut
-#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:163
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java:164
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:72
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:87
@@ -14035,41 +14628,41 @@
 msgstr "Vstup hmotnostnej hodnoty"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:137
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
 msgid "Slippy Map"
 msgstr "Slippy Map"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:148
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
 msgid "Auto Zoom"
 msgstr "Auto Zoom"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:157
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
 msgid "Load Tile"
 msgstr "Nahrať Dlaždice (Tiles)"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:167
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
 msgid "Show Tile Info"
 msgstr "Ukázať Info Dlaždíc"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:189
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
 msgid "Load All Tiles"
 msgstr "Nahrať Všetky Dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:198
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
 msgid "Increase zoom"
 msgstr "Priblíženie"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:206
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
 msgid "Decrease zoom"
 msgstr "Oddialiť"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:216
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
 msgid "Snap to tile size"
 msgstr "Snímka na veľkosť dlaždice"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:232
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
 msgid "Flush Tile Cache"
 msgstr "Flush Tile Cache"
 
-#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:668
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
 msgid "image "
 msgstr "obrázok "
@@ -14243,4 +14836,43 @@
 msgstr "Najskôr určite zdroj predvoľby značenia v predvoľbách."
 
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#, fuzzy
+msgid "Even/Odd"
+msgstr "Vyrovnať (even)"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+msgid "Lowest number"
+msgstr "Najnižšie číslo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+msgid "Highest number"
+msgstr "Navyššie číslo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
+#, fuzzy
+msgid "Segments"
+msgstr "Hlavné komunikácie"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+msgid "Lowest housenumber cannot be higher than highest housenumber"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+msgid "Housenumbers do not match odd/even setting"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+msgid "Segment must be a number greater 1"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+msgid " must be greater than 0"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#, fuzzy
+msgid " is not a number"
+msgstr "Navyššie číslo"
+
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
 msgid "Reverse a terrace"
@@ -14259,42 +14891,20 @@
 msgstr "Otočiť smer radu budov"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:68
-#: ../plugins/terracer/src/terracer/TerracerAction.java:72
+#: ../plugins/terracer/src/terracer/TerracerAction.java:53
+#: ../plugins/terracer/src/terracer/TerracerAction.java:56
 msgid "Terrace a building"
 msgstr "Vytvoriť rad budov"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:70
+#: ../plugins/terracer/src/terracer/TerracerAction.java:54
 msgid "Creates individual buildings from a long building."
 msgstr "Vytvoriť viac jednotlivých budov z jednej dlhej budovy."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:130
+#: ../plugins/terracer/src/terracer/TerracerAction.java:96
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Vyberte jedinú, uzavretú cestu s najmenej štyrmi bodmi."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:199
+#: ../plugins/terracer/src/terracer/TerracerAction.java:185
 msgid "Terrace"
 msgstr "Rad (Terrace)"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:472
-msgid "Highest number"
-msgstr "Navyššie číslo"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:473
-msgid "Lowest number"
-msgstr "Najnižšie číslo"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:474
-msgid "Interpolation"
-msgstr "Interpolácia (vloženie)"
-
-#. item "Man-Made/Buildings/Addresses" text "House name"
-#: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2290
-msgid "Street name"
-msgstr "Názov ulice"
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:475
-msgid "Optional"
-msgstr "Voliteľné"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37
@@ -14309,5 +14919,5 @@
 msgstr "Žiadne chyby na overenie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169
 msgid "Grid"
 msgstr "Mriežka"
@@ -14975,38 +15585,8 @@
 #.
 #. <rule>
-#. <condition k="building" b="yes"/>
+#. <condition k="building"/>
 #. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
-#. color building
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="building" v="church"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#. color building
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="building" v="museum"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#. color building
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="building" v="tower"/>
-#. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
-#. color building
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="building" v="station"/>
-#. <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:4167 build/trans_style.java:4174
-#: build/trans_style.java:4181 build/trans_style.java:4188
-#: build/trans_style.java:4195
+#: build/trans_style.java:4174
 msgid "building"
 msgstr "budova"
@@ -15020,5 +15600,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4202
+#: build/trans_style.java:4181
 msgid "area"
 msgstr "oblasť (plocha)"
@@ -15136,10 +15716,10 @@
 msgstr "Nemôžem čítať informácie z walking-papers.org the id \"{0}\""
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:60
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
 #, java-format
 msgid "Walking Papers: {0}"
 msgstr "Walking Papers: {0}"
 
-#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:360
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
 #, java-format
 msgid "Walking Papers layer ({0}) in zoom {1}"
@@ -15902,6 +16482,6 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1571 build/trans_presets.java:2400
-#: build/trans_presets.java:3188
+#: build/trans_presets.java:1560 build/trans_presets.java:2389
+#: build/trans_presets.java:3191
 msgid "Reference"
 msgstr "Ref. číslo"
@@ -16347,5 +16927,5 @@
 #: build/trans_presets.java:731 build/trans_presets.java:744
 #: build/trans_presets.java:757 build/trans_presets.java:1322
-#: build/trans_presets.java:1512 build/trans_presets.java:1554
+#: build/trans_presets.java:1498 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Šírka (v metroch)"
@@ -16463,5 +17043,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2475
+#: build/trans_presets.java:1320 build/trans_presets.java:2464
 msgid "metal"
 msgstr "kov"
@@ -16473,5 +17053,5 @@
 #: build/trans_presets.java:483 build/trans_presets.java:502
 #: build/trans_presets.java:521 build/trans_presets.java:677
-#: build/trans_presets.java:1320 build/trans_presets.java:2475
+#: build/trans_presets.java:1320 build/trans_presets.java:2464
 msgid "wood"
 msgstr "drevo (wood)"
@@ -16729,4 +17309,7 @@
 #. item "Car/Parking" combo "Spaces for Women"
 #. item "Car/Parking" combo "Spaces for Parents"
+#. item "Public Transport/Bus Stop" combo "Shelter"
+#. item "Public Transport/Bus Stop" combo "Bench"
+#. item "Public Transport/Bus Stop" combo "Tactile Paving"
 #. item "Tourism/Information Terminal" combo "Fee"
 #. item "Tourism/Audioguide" combo "Fee"
@@ -16758,8 +17341,10 @@
 #: build/trans_presets.java:1408 build/trans_presets.java:1411
 #: build/trans_presets.java:1412 build/trans_presets.java:1413
-#: build/trans_presets.java:1778 build/trans_presets.java:1788
-#: build/trans_presets.java:2438 build/trans_presets.java:2474
-#: build/trans_presets.java:2483 build/trans_presets.java:2484
-#: build/trans_presets.java:2485 build/trans_presets.java:2755
+#: build/trans_presets.java:1532 build/trans_presets.java:1533
+#: build/trans_presets.java:1534 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2427
+#: build/trans_presets.java:2463 build/trans_presets.java:2472
+#: build/trans_presets.java:2473 build/trans_presets.java:2474
+#: build/trans_presets.java:2758
 msgid "yes"
 msgstr "áno"
@@ -16907,9 +17492,10 @@
 #: build/trans_presets.java:1407 build/trans_presets.java:1408
 #: build/trans_presets.java:1411 build/trans_presets.java:1412
-#: build/trans_presets.java:1413 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2438
-#: build/trans_presets.java:2474 build/trans_presets.java:2483
-#: build/trans_presets.java:2484 build/trans_presets.java:2485
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:1413 build/trans_presets.java:1532
+#: build/trans_presets.java:1533 build/trans_presets.java:1534
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2427 build/trans_presets.java:2463
+#: build/trans_presets.java:2472 build/trans_presets.java:2473
+#: build/trans_presets.java:2474 build/trans_presets.java:2758
 msgid "no"
 msgstr "nie"
@@ -17154,5 +17740,5 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:361 build/trans_style.java:3159
+#: build/trans_presets.java:361 build/trans_style.java:3175
 msgid "residential"
 msgstr "obytná (osídlená)"
@@ -17187,5 +17773,5 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_presets.java:361 build/trans_style.java:667
-#: build/trans_style.java:4260
+#: build/trans_style.java:4239
 msgid "service"
 msgstr "obslužná (service)"
@@ -17219,6 +17805,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:361 build/trans_style.java:877
-#: build/trans_style.java:3224 build/trans_style.java:3225
+#: build/trans_presets.java:361 build/trans_style.java:848
+#: build/trans_style.java:3240 build/trans_style.java:3241
 msgid "construction"
 msgstr "konštrukcia"
@@ -17268,5 +17854,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:423 build/trans_style.java:895
+#: build/trans_presets.java:423 build/trans_style.java:866
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -17454,6 +18040,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:682 build/trans_presets.java:1740
-#: build/trans_presets.java:1763
+#: build/trans_presets.java:682 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Turistika"
@@ -17574,5 +18160,4 @@
 #. item "Car/Fuel" text "Name"
 #. item "Car/Wash" text "Name"
-#. item "Car/Shop" text "Name"
 #. item "Car/Repair" text "Name"
 #. item "Car/Rental" text "Name"
@@ -17598,4 +18183,5 @@
 #. item "Amenities/Baby Hatch" label "Edit Baby Hatch"
 #. <key key="amenity" value="baby_hatch" />
+#. item "Shops/Car Dealer" text "Name"
 #. item "Cash/Bank" text "Name"
 #. item "Cash/Automated Teller Machine" label "Edit Automated Teller Machine"
@@ -17605,15 +18191,15 @@
 #: build/trans_presets.java:777 build/trans_presets.java:914
 #: build/trans_presets.java:1396 build/trans_presets.java:1420
-#: build/trans_presets.java:1427 build/trans_presets.java:1433
-#: build/trans_presets.java:1441 build/trans_presets.java:1448
-#: build/trans_presets.java:1776 build/trans_presets.java:1786
-#: build/trans_presets.java:2215 build/trans_presets.java:2317
-#: build/trans_presets.java:2347 build/trans_presets.java:2399
-#: build/trans_presets.java:2407 build/trans_presets.java:2424
-#: build/trans_presets.java:2436 build/trans_presets.java:2444
-#: build/trans_presets.java:2451 build/trans_presets.java:2505
-#: build/trans_presets.java:2553 build/trans_presets.java:2719
-#: build/trans_presets.java:2734 build/trans_presets.java:2773
-#: build/trans_presets.java:3193
+#: build/trans_presets.java:1426 build/trans_presets.java:1434
+#: build/trans_presets.java:1441 build/trans_presets.java:1765
+#: build/trans_presets.java:1775 build/trans_presets.java:2204
+#: build/trans_presets.java:2306 build/trans_presets.java:2336
+#: build/trans_presets.java:2388 build/trans_presets.java:2396
+#: build/trans_presets.java:2413 build/trans_presets.java:2425
+#: build/trans_presets.java:2433 build/trans_presets.java:2440
+#: build/trans_presets.java:2494 build/trans_presets.java:2504
+#: build/trans_presets.java:2556 build/trans_presets.java:2722
+#: build/trans_presets.java:2737 build/trans_presets.java:2776
+#: build/trans_presets.java:3196
 msgid "Operator"
 msgstr "Operátor"
@@ -17826,7 +18412,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:854 build/trans_presets.java:1615
-#: build/trans_presets.java:1760 build/trans_presets.java:2887
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
+#: build/trans_presets.java:854 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2890
+#: build/trans_presets.java:2897 build/trans_presets.java:2904
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -18251,5 +18837,5 @@
 msgstr "slatina"
 
-#. color deprecated
+#. color woodarea
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -18259,5 +18845,5 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1148 build/trans_style.java:3400
+#: build/trans_presets.java:1148 build/trans_style.java:3407
 msgid "marsh"
 msgstr "močiar (marsh)"
@@ -18784,32 +19370,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1397 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1651
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1693
-#: build/trans_presets.java:1701 build/trans_presets.java:1714
-#: build/trans_presets.java:1728 build/trans_presets.java:1825
-#: build/trans_presets.java:1833 build/trans_presets.java:1936
-#: build/trans_presets.java:1942 build/trans_presets.java:2255
-#: build/trans_presets.java:2279 build/trans_presets.java:2506
-#: build/trans_presets.java:2514 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 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:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2652
-#: build/trans_presets.java:2658 build/trans_presets.java:2664
-#: build/trans_presets.java:2670 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
-#: build/trans_presets.java:2697 build/trans_presets.java:2703
-#: build/trans_presets.java:2709 build/trans_presets.java:2720
-#: build/trans_presets.java:2728 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2757
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:1397 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1925
+#: build/trans_presets.java:1931 build/trans_presets.java:2244
+#: build/trans_presets.java:2268 build/trans_presets.java:2495
+#: build/trans_presets.java:2517 build/trans_presets.java:2523
+#: build/trans_presets.java:2530 build/trans_presets.java:2537
+#: build/trans_presets.java:2543 build/trans_presets.java:2549
+#: build/trans_presets.java:2571 build/trans_presets.java:2578
+#: build/trans_presets.java:2585 build/trans_presets.java:2591
+#: build/trans_presets.java:2598 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2667
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2686 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2706
+#: build/trans_presets.java:2712 build/trans_presets.java:2723
+#: build/trans_presets.java:2731 build/trans_presets.java:2746
+#: build/trans_presets.java:2752 build/trans_presets.java:2760
+#: build/trans_presets.java:2787
 msgid "Opening Hours"
 msgstr "Otváracia doba"
@@ -18868,91 +19454,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1397 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1651
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1714 build/trans_presets.java:1728
-#: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1936 build/trans_presets.java:1942
-#: build/trans_presets.java:2255 build/trans_presets.java:2279
-#: build/trans_presets.java:2514 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 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:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2652
-#: build/trans_presets.java:2658 build/trans_presets.java:2664
-#: build/trans_presets.java:2670 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
-#: build/trans_presets.java:2697 build/trans_presets.java:2703
-#: build/trans_presets.java:2709 build/trans_presets.java:2720
-#: build/trans_presets.java:2728 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2757
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:1397 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1925 build/trans_presets.java:1931
+#: build/trans_presets.java:2244 build/trans_presets.java:2268
+#: build/trans_presets.java:2517 build/trans_presets.java:2523
+#: build/trans_presets.java:2530 build/trans_presets.java:2537
+#: build/trans_presets.java:2543 build/trans_presets.java:2549
+#: build/trans_presets.java:2571 build/trans_presets.java:2578
+#: build/trans_presets.java:2585 build/trans_presets.java:2591
+#: build/trans_presets.java:2598 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2667
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2686 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2706
+#: build/trans_presets.java:2712 build/trans_presets.java:2723
+#: build/trans_presets.java:2731 build/trans_presets.java:2746
+#: build/trans_presets.java:2752 build/trans_presets.java:2760
+#: build/trans_presets.java:2787
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1397 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1651
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1714 build/trans_presets.java:1728
-#: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1936 build/trans_presets.java:1942
-#: build/trans_presets.java:2255 build/trans_presets.java:2279
-#: build/trans_presets.java:2514 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 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:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2652
-#: build/trans_presets.java:2658 build/trans_presets.java:2664
-#: build/trans_presets.java:2670 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
-#: build/trans_presets.java:2697 build/trans_presets.java:2703
-#: build/trans_presets.java:2709 build/trans_presets.java:2720
-#: build/trans_presets.java:2728 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2757
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:1397 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1925 build/trans_presets.java:1931
+#: build/trans_presets.java:2244 build/trans_presets.java:2268
+#: build/trans_presets.java:2517 build/trans_presets.java:2523
+#: build/trans_presets.java:2530 build/trans_presets.java:2537
+#: build/trans_presets.java:2543 build/trans_presets.java:2549
+#: build/trans_presets.java:2571 build/trans_presets.java:2578
+#: build/trans_presets.java:2585 build/trans_presets.java:2591
+#: build/trans_presets.java:2598 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2667
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2686 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2706
+#: build/trans_presets.java:2712 build/trans_presets.java:2723
+#: build/trans_presets.java:2731 build/trans_presets.java:2746
+#: build/trans_presets.java:2752 build/trans_presets.java:2760
+#: build/trans_presets.java:2787
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pi 08:30-20:00"
 
-#: build/trans_presets.java:1397 build/trans_presets.java:1636
-#: build/trans_presets.java:1644 build/trans_presets.java:1651
-#: build/trans_presets.java:1658 build/trans_presets.java:1664
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1693 build/trans_presets.java:1701
-#: build/trans_presets.java:1714 build/trans_presets.java:1728
-#: build/trans_presets.java:1825 build/trans_presets.java:1833
-#: build/trans_presets.java:1936 build/trans_presets.java:1942
-#: build/trans_presets.java:2255 build/trans_presets.java:2279
-#: build/trans_presets.java:2514 build/trans_presets.java:2520
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2568 build/trans_presets.java:2575
-#: build/trans_presets.java:2582 build/trans_presets.java:2588
-#: build/trans_presets.java:2595 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:2632 build/trans_presets.java:2639
-#: build/trans_presets.java:2646 build/trans_presets.java:2652
-#: build/trans_presets.java:2658 build/trans_presets.java:2664
-#: build/trans_presets.java:2670 build/trans_presets.java:2676
-#: build/trans_presets.java:2683 build/trans_presets.java:2690
-#: build/trans_presets.java:2697 build/trans_presets.java:2703
-#: build/trans_presets.java:2709 build/trans_presets.java:2720
-#: build/trans_presets.java:2728 build/trans_presets.java:2743
-#: build/trans_presets.java:2749 build/trans_presets.java:2757
-#: build/trans_presets.java:2784
+#: build/trans_presets.java:1397 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1925 build/trans_presets.java:1931
+#: build/trans_presets.java:2244 build/trans_presets.java:2268
+#: build/trans_presets.java:2517 build/trans_presets.java:2523
+#: build/trans_presets.java:2530 build/trans_presets.java:2537
+#: build/trans_presets.java:2543 build/trans_presets.java:2549
+#: build/trans_presets.java:2571 build/trans_presets.java:2578
+#: build/trans_presets.java:2585 build/trans_presets.java:2591
+#: build/trans_presets.java:2598 build/trans_presets.java:2604
+#: build/trans_presets.java:2610 build/trans_presets.java:2616
+#: build/trans_presets.java:2622 build/trans_presets.java:2628
+#: build/trans_presets.java:2635 build/trans_presets.java:2642
+#: build/trans_presets.java:2649 build/trans_presets.java:2655
+#: build/trans_presets.java:2661 build/trans_presets.java:2667
+#: build/trans_presets.java:2673 build/trans_presets.java:2679
+#: build/trans_presets.java:2686 build/trans_presets.java:2693
+#: build/trans_presets.java:2700 build/trans_presets.java:2706
+#: build/trans_presets.java:2712 build/trans_presets.java:2723
+#: build/trans_presets.java:2731 build/trans_presets.java:2746
+#: build/trans_presets.java:2752 build/trans_presets.java:2760
+#: build/trans_presets.java:2787
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00"
@@ -18967,5 +19553,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1399 build/trans_presets.java:1452
+#: build/trans_presets.java:1399 build/trans_presets.java:1445
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -18984,7 +19570,7 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1405 build/trans_presets.java:1777
-#: build/trans_presets.java:1787 build/trans_presets.java:2437
-#: build/trans_presets.java:2554
+#: build/trans_presets.java:1405 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2426
+#: build/trans_presets.java:2557
 msgid "Reference number"
 msgstr "Referenčné číslo"
@@ -19000,5 +19586,5 @@
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1406 build/trans_presets.java:2349
+#: build/trans_presets.java:1406 build/trans_presets.java:2338
 msgid "underground"
 msgstr "podzemie"
@@ -19011,6 +19597,6 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1408 build/trans_presets.java:1778
-#: build/trans_presets.java:1788 build/trans_presets.java:2438
+#: build/trans_presets.java:1408 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2427
 msgid "Fee"
 msgstr "Poplatok"
@@ -19049,22 +19635,10 @@
 
 #. item "Car/Wash" text "Operator"
-#. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1422 build/trans_presets.java:1466
-msgid "Shop"
-msgstr "Obchod"
-
-#. item "Car/Shop"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1424
-msgid "Edit Car Shop"
-msgstr "Upraviť obchod s autami"
-
-#. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1422
 msgid "Repair"
 msgstr "Servis"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1430
+#: build/trans_presets.java:1423
 msgid "Edit Car Repair"
 msgstr "Upraviť autoservis"
@@ -19072,5 +19646,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1435 build/trans_presets.java:1459
+#: build/trans_presets.java:1428 build/trans_presets.java:1452
 msgid "Rental"
 msgstr "Požičovňa"
@@ -19079,10 +19653,10 @@
 #. <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:1438
+#: build/trans_presets.java:1431
 msgid "Edit Car Rental"
 msgstr "Upraviť autopožičovňu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Sharing"
 msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -19090,5 +19664,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1438
 msgid "Edit Car Sharing"
 msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)"
@@ -19096,10 +19670,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1454
+#: build/trans_presets.java:1447
 msgid "Edit Bicycle Parking"
 msgstr "Upraviť parkovisko bicyklov"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1450
 msgid "Capacity"
 msgstr "Kapacita"
@@ -19108,22 +19682,15 @@
 #. <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:1462
+#: build/trans_presets.java:1455
 msgid "Edit Bicycle Rental"
 msgstr "Upraviť požičovňu bicyklov"
 
-#. item "Bicycle/Shop"
-#. <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:1469
-msgid "Edit Bicycle Shop"
-msgstr "Upraviť bicyklový obchod"
-
-#. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1474
+#. item "Bicycle/Rental" text "Name"
+#: build/trans_presets.java:1460
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1475
+#: build/trans_presets.java:1461
 msgctxt "railway"
 msgid "Station"
@@ -19133,5 +19700,5 @@
 #. <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:1478
+#: build/trans_presets.java:1464
 msgctxt "railway"
 msgid "Edit Station"
@@ -19139,5 +19706,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1483
+#: build/trans_presets.java:1469
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -19145,5 +19712,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1472
 msgid "Railway Halt"
 msgstr "Železničná zastávka"
@@ -19151,5 +19718,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1474
 msgid "Edit Halt"
 msgstr "Upraviť zastávku"
@@ -19157,5 +19724,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1495
+#: build/trans_presets.java:1481
 msgid "Tram Stop"
 msgstr "Zastávka električky"
@@ -19164,5 +19731,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:1498
+#: build/trans_presets.java:1484
 msgid "Edit Tram Stop"
 msgstr "Upraviť zastávku električky"
@@ -19170,5 +19737,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1491
 msgid "Railway Platform"
 msgstr "Železničné nástupište"
@@ -19177,5 +19744,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:1508
+#: build/trans_presets.java:1494
 msgid "Edit Railway Platform"
 msgstr "Upraviť železničné nástupište"
@@ -19187,5 +19754,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1511 build/trans_presets.java:1553
+#: build/trans_presets.java:1497 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Referencie (číslo stopy(track))"
@@ -19193,10 +19760,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1513 build/trans_presets.java:1555
+#: build/trans_presets.java:1499 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Oblasť"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1501
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -19205,10 +19772,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:1518
+#: build/trans_presets.java:1504
 msgid "Edit Subway Entrance"
 msgstr "Upraviť vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1509
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -19217,5 +19784,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1514
 msgid "Bus Station"
 msgstr "Autobusová stanica"
@@ -19224,5 +19791,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:1531
+#: build/trans_presets.java:1517
 msgid "Edit Bus Station"
 msgstr "Upraviť autobusovú stanicu"
@@ -19230,5 +19797,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1537
+#: build/trans_presets.java:1523
 msgid "Bus Stop"
 msgstr "Autobusová zastávka"
@@ -19238,5 +19805,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:1541
+#: build/trans_presets.java:1527
 msgid "Edit Bus Stop"
 msgstr "Upraviť autobusovú zastávku"
@@ -19245,17 +19812,25 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1546 build/trans_presets.java:1800
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:1532 build/trans_presets.java:1789
+#: build/trans_presets.java:2472
 msgid "Shelter"
 msgstr "Prístrešok"
 
-#. item "Public Transport/Bus Stop" check "Shelter"
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:1533 build/trans_presets.java:2460
+msgid "Bench"
+msgstr "Lavička"
+
+#: build/trans_presets.java:1534
+msgid "Tactile Paving"
+msgstr ""
+
 #. </optional>
-#: build/trans_presets.java:1549
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Autobusové nástupište"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1550
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Upraviť autobusové nástupište"
@@ -19263,5 +19838,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -19269,5 +19844,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Upraviť stanicu taxíkov"
@@ -19275,5 +19850,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1565
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Letisko"
@@ -19281,15 +19856,15 @@
 #. item "Public Transport/Airport"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1567
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Upraviť letisko"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1572
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -19297,10 +19872,10 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1578
+#: build/trans_presets.java:1567
 msgid "Travel"
 msgstr "Cestovanie"
 
 #. group "Travel"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Ubytovanie"
@@ -19312,5 +19887,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1580 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -19319,15 +19894,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:1583
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Upraviť hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Hviezdičkový"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1588
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -19335,20 +19910,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Upraviť motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1594
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1599
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Chata"
@@ -19356,10 +19931,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Upraviť chatu"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -19367,30 +19942,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Upraviť ubytovňu"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1611
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1622
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -19398,10 +19973,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Upraviť stanový tábor"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -19412,5 +19987,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1630 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Reštaurácia"
@@ -19418,5 +19993,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1632
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Upraviť reštauráciu"
@@ -19424,5 +19999,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -19430,61 +20005,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1635 build/trans_presets.java:1643
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -19492,9 +20067,9 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -19502,9 +20077,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1648
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Krčma"
@@ -19512,18 +20087,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1661
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -19531,9 +20106,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -19541,24 +20116,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
-#: build/trans_presets.java:1681
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1683
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Múzeum"
@@ -19566,9 +20141,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Upraviť múzeum"
 
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -19577,9 +20152,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:1698
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Upraviť zoo"
 
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -19587,24 +20162,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Zábavný park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1711
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1716
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Umelecké dielo"
@@ -19612,5 +20187,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Upraviť umelecké dielo"
@@ -19618,19 +20193,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Informačná kancelária"
 
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr "Úroveň detailu"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr "topografická"
@@ -19668,5 +20243,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1735 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -19674,28 +20249,28 @@
 msgstr "pouličná sieť"
 
-#: build/trans_presets.java:1735
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr "prehľadová (oreintačná)"
 
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr "Zobrazená oblasť"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr "miesto (blízke okolie)"
 
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr "mesto (city)"
 
-#: build/trans_presets.java:1736
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr "oblasť (region)"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1737 build/trans_presets.java:1753
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -19705,5 +20280,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1739 build/trans_presets.java:1762
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr "Zobrazené cesty sú pre:"
@@ -19711,6 +20286,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1741 build/trans_presets.java:1764
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1971
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -19718,5 +20293,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1742 build/trans_presets.java:1765
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr "Horský bicykel"
@@ -19724,6 +20299,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1743 build/trans_presets.java:1766
-#: build/trans_presets.java:2036
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2025
 msgid "Skiing"
 msgstr "Lyžovanie"
@@ -19731,5 +20306,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1744 build/trans_presets.java:1767
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr "Jazdectvo"
@@ -19737,46 +20312,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1745 build/trans_presets.java:1768
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr "... iný druh prepravy"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr "Informačný panel s radami (board content)"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr "upozornenie"
 
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "divoká príroda"
 
-#: build/trans_presets.java:1752
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr "závod"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr "Rázcestník (ukazovateľ smeru)"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1770
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr "Informačný terminál"
@@ -19784,29 +20359,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1775 build/trans_presets.java:1785
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1780
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr "Audiosprievodcovia"
 
 #. <space />
-#: build/trans_presets.java:1790
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr "Audiosprievodcovia cez mobilný telefón?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr "Číslo telefónu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1793
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Ostatné (iné) informačné body (miesta)"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1801
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -19814,25 +20389,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1804 build/trans_presets.java:1810
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Hrad"
@@ -19841,19 +20416,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:1817
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Zrúcanina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Upraviť zrúcaninu"
 
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -19862,9 +20437,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:1830
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
-#: build/trans_presets.java:1835
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -19872,10 +20447,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Upraviť bojisko"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1841
+#: build/trans_presets.java:1830
 msgid "Palaeontological Site"
 msgstr "Palaeontological Areál"
@@ -19883,5 +20458,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1832
 msgid "Edit Palaeontological Site"
 msgstr "Upraviť Palaeontological Areál"
@@ -19889,15 +20464,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1837
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1838
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1853
+#: build/trans_presets.java:1842
 msgid "Memorial"
 msgstr "Pomník"
@@ -19905,55 +20480,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1844
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1859
+#: build/trans_presets.java:1848
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1849
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1864
+#: build/trans_presets.java:1853
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1865
+#: build/trans_presets.java:1854
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1858
 msgid "Boundary Stone"
 msgstr "Hraničné kamene"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1859
 msgid "Edit Boundary Stone"
 msgstr "Upraviť hraničné kamene"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:1864
 msgid "Leisure"
 msgstr "Voľný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1865
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1866
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:1870
 msgid "Playground"
 msgstr "Ihrisko"
@@ -19961,35 +20536,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1872
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1876
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1877
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1894 build/trans_presets.java:2699
+#: build/trans_presets.java:1883 build/trans_presets.java:2702
 msgid "Sports"
 msgstr "Športy"
 
 #. group "Sports"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1884
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1885
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1886
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -20003,6 +20578,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1901 build/trans_presets.java:1910
-#: build/trans_presets.java:1919 build/trans_presets.java:1928
+#: build/trans_presets.java:1890 build/trans_presets.java:1899
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -20394,30 +20969,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
-#: 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 build/trans_style.java:3940
-#: build/trans_style.java:3948
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
+#: build/trans_style.java:3587 build/trans_style.java:3595
+#: build/trans_style.java:3603 build/trans_style.java:3611
+#: build/trans_style.java:3619 build/trans_style.java:3627
+#: build/trans_style.java:3635 build/trans_style.java:3643
+#: build/trans_style.java:3651 build/trans_style.java:3659
+#: build/trans_style.java:3667 build/trans_style.java:3675
+#: build/trans_style.java:3683 build/trans_style.java:3691
+#: build/trans_style.java:3699 build/trans_style.java:3707
+#: build/trans_style.java:3715 build/trans_style.java:3723
+#: build/trans_style.java:3731 build/trans_style.java:3739
+#: build/trans_style.java:3747 build/trans_style.java:3755
+#: build/trans_style.java:3763 build/trans_style.java:3771
+#: build/trans_style.java:3779 build/trans_style.java:3787
+#: build/trans_style.java:3795 build/trans_style.java:3803
+#: build/trans_style.java:3811 build/trans_style.java:3819
+#: build/trans_style.java:3827 build/trans_style.java:3835
+#: build/trans_style.java:3843 build/trans_style.java:3851
+#: build/trans_style.java:3859 build/trans_style.java:3867
+#: build/trans_style.java:3875 build/trans_style.java:3883
+#: build/trans_style.java:3891 build/trans_style.java:3899
+#: build/trans_style.java:3907 build/trans_style.java:3915
+#: build/trans_style.java:3923 build/trans_style.java:3931
+#: build/trans_style.java:3939 build/trans_style.java:3947
+#: build/trans_style.java:3955
 msgid "sport"
 msgstr "šport"
@@ -20427,68 +21002,68 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "croquet"
 msgstr ""
@@ -20496,160 +21071,160 @@
 "trávnika)"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "football"
 msgstr "americký futbal"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1903 build/trans_presets.java:1912
-#: build/trans_presets.java:1921 build/trans_presets.java:1930
+#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1910 build/trans_presets.java:1919
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1894
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1895
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1914
+#: build/trans_presets.java:1903
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1915
+#: build/trans_presets.java:1904
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:1912
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1924
+#: build/trans_presets.java:1913
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1921
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1933
+#: build/trans_presets.java:1922
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1927
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1928
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1934
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1935
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:1936
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -20688,21 +21263,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1939 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: 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:2032
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2065 build/trans_presets.java:2071
+#: build/trans_presets.java:2077 build/trans_presets.java:2083
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: 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
 msgid "type"
 msgstr "typ"
@@ -20741,203 +21316,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1939 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: 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:2032
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2065 build/trans_presets.java:2071
+#: build/trans_presets.java:2077 build/trans_presets.java:2083
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: 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
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1939 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: 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:2032
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2065 build/trans_presets.java:2071
+#: build/trans_presets.java:2077 build/trans_presets.java:2083
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: 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
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1939 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: 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:2032
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2065 build/trans_presets.java:2071
+#: build/trans_presets.java:2077 build/trans_presets.java:2083
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: 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
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
-#: build/trans_presets.java:2010 build/trans_presets.java:2016
-#: build/trans_presets.java:2022 build/trans_presets.java:2028
-#: build/trans_presets.java:2034 build/trans_presets.java:2043
-#: build/trans_presets.java:2050 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2070
-#: build/trans_presets.java:2076 build/trans_presets.java:2082
-#: build/trans_presets.java:2088 build/trans_presets.java:2094
-#: build/trans_presets.java:2100 build/trans_presets.java:2106
-#: build/trans_presets.java:2112 build/trans_presets.java:2118
-#: build/trans_presets.java:2124 build/trans_presets.java:2130
-#: build/trans_presets.java:2136 build/trans_presets.java:2142
-#: build/trans_presets.java:2148 build/trans_presets.java:2154
+#: build/trans_presets.java:1939 build/trans_presets.java:1945
+#: build/trans_presets.java:1951 build/trans_presets.java:1957
+#: 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:2032
+#: build/trans_presets.java:2039 build/trans_presets.java:2047
+#: build/trans_presets.java:2053 build/trans_presets.java:2059
+#: build/trans_presets.java:2065 build/trans_presets.java:2071
+#: build/trans_presets.java:2077 build/trans_presets.java:2083
+#: build/trans_presets.java:2089 build/trans_presets.java:2095
+#: build/trans_presets.java:2101 build/trans_presets.java:2107
+#: 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
 msgid "track"
 msgstr "stopa"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1941
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1942
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:1947
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1948
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:1953
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1954
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:1959
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1960
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:1965
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1966
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1972
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:1977
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1978
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:1983
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1984
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:1989
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1990
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:2006
+#: build/trans_presets.java:1995
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:1996
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:2012
+#: build/trans_presets.java:2001
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2002
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2007
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2008
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:2024
+#: build/trans_presets.java:2013
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2014
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:2030
+#: build/trans_presets.java:2019
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2020
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
@@ -20945,56 +21520,56 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2027
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2030
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2030
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2030
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:2041
+#: build/trans_presets.java:2030
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2031
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2031
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2031
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2031
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2031
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2031
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:2042
+#: build/trans_presets.java:2031
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2034
 msgid "Shooting"
 msgstr "Streľba"
@@ -21002,182 +21577,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2047
+#: build/trans_presets.java:2036
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2042
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2043
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2055
+#: build/trans_presets.java:2044
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2049
 msgid "Football"
 msgstr "Americký futbal"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2050
 msgid "Edit Football"
 msgstr "Upraviť americký futbal"
 
-#: build/trans_presets.java:2066
+#: build/trans_presets.java:2055
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2056
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:2072
+#: build/trans_presets.java:2061
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2062
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:2078
+#: build/trans_presets.java:2067
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2068
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:2084
+#: build/trans_presets.java:2073
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2074
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2077
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:2090
+#: build/trans_presets.java:2079
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2080
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:2096
+#: build/trans_presets.java:2085
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2086
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:2102
+#: build/trans_presets.java:2091
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2092
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:2108
+#: build/trans_presets.java:2097
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2098
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2114
+#: build/trans_presets.java:2103
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2104
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2109
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2110
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2126
+#: build/trans_presets.java:2115
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2116
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2121
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2122
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2138
+#: build/trans_presets.java:2127
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2128
 msgid "Edit Rugby"
 msgstr "Upraviť ragby"
 
-#: build/trans_presets.java:2144
+#: build/trans_presets.java:2133
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2134
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2150
+#: build/trans_presets.java:2139
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2140
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2147
 msgid "Man-Made"
 msgstr "Človekom-Vytvorené (Man-Made)"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2159
+#: build/trans_presets.java:2148
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2149
 msgid "Building"
 msgstr "Budova"
@@ -21185,5 +21760,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2163
+#: build/trans_presets.java:2152
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -21191,10 +21766,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2154
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2169
+#: build/trans_presets.java:2158
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -21202,10 +21777,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2160
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2164
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -21213,10 +21788,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2177
+#: build/trans_presets.java:2166
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2181
+#: build/trans_presets.java:2170
 msgid "Courthouse"
 msgstr "Súd"
@@ -21225,10 +21800,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:2184
+#: build/trans_presets.java:2173
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2177
 msgid "Prison"
 msgstr "Vezenie"
@@ -21237,10 +21812,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:2191
+#: build/trans_presets.java:2180
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2184
 msgid "Police"
 msgstr "Polícia"
@@ -21250,10 +21825,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:2199
+#: build/trans_presets.java:2188
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2203
+#: build/trans_presets.java:2192
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -21262,10 +21837,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:2206
+#: build/trans_presets.java:2195
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2199
 msgid "Post Office"
 msgstr "Pošta"
@@ -21273,5 +21848,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2212
+#: build/trans_presets.java:2201
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -21279,15 +21854,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2218
+#: build/trans_presets.java:2207
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2208
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2212
 msgid "School"
 msgstr "Škola"
@@ -21295,10 +21870,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2214
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2218
 msgid "University"
 msgstr "Univerzita"
@@ -21306,10 +21881,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2231
+#: build/trans_presets.java:2220
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2235
+#: build/trans_presets.java:2224
 msgid "College"
 msgstr "Vysoká škola"
@@ -21317,5 +21892,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2237
+#: build/trans_presets.java:2226
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -21323,5 +21898,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2231
 msgid "Cinema"
 msgstr "Kino"
@@ -21330,10 +21905,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:2245
+#: build/trans_presets.java:2234
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2238
 msgid "Library"
 msgstr "Knižnica"
@@ -21342,9 +21917,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:2252
+#: build/trans_presets.java:2241
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
-#: build/trans_presets.java:2257
+#: build/trans_presets.java:2246
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -21352,10 +21927,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2248
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2252
 msgid "Theatre"
 msgstr "Divadlo"
@@ -21364,10 +21939,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:2266
+#: build/trans_presets.java:2255
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2259
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -21377,5 +21952,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:2274
+#: build/trans_presets.java:2263
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -21384,6 +21959,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -21392,66 +21967,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2277 build/trans_presets.java:3074
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:2266 build/trans_presets.java:3077
+#: build/trans_presets.java:3086
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -21460,81 +22035,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2278 build/trans_presets.java:3075
-#: build/trans_presets.java:3084
+#: build/trans_presets.java:2267 build/trans_presets.java:3078
+#: build/trans_presets.java:3087
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2271
 msgid "Addresses"
 msgstr "Adresy"
@@ -21543,5 +22118,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:2285
+#: build/trans_presets.java:2274
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -21549,5 +22124,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2276
 msgid "House number"
 msgstr "Číslo domu"
@@ -21555,20 +22130,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2278
 msgid "House name"
 msgstr "Meno domu"
 
+#. item "Man-Made/Buildings/Addresses" text "House name"
+#: build/trans_presets.java:2279
+msgid "Street name"
+msgstr "Názov ulice"
+
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2280
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2281
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2293
+#: build/trans_presets.java:2282
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -21577,5 +22157,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:2299
+#: build/trans_presets.java:2288
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -21583,61 +22163,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2290
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2290
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2290
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2301
+#: build/trans_presets.java:2290
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2293
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2305
+#: build/trans_presets.java:2294
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2295
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2299
 msgid "Tower"
 msgstr "Veža"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2300
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2303
 msgid "Tower type"
 msgstr "Typ veže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2303
 msgid "communication"
 msgstr "telekomunikačná"
 
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2303
 msgid "observation"
 msgstr "pozorovateľňa"
 
 #. <optional>
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2305
 msgid "Height (meters)"
 msgstr "Výška (metre)"
@@ -21645,25 +22225,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2309
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2310
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2314
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2315
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2319
 msgid "Lighthouse"
 msgstr "Maják"
@@ -21671,10 +22251,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2321
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2325
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -21682,10 +22262,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2327
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2331
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -21694,37 +22274,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2334
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2337
 msgid "oil"
 msgstr "ropa(oil)"
 
-#: build/trans_presets.java:2348 build/trans_presets.java:2390
+#: build/trans_presets.java:2337 build/trans_presets.java:2379
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2337
 msgid "sewage"
 msgstr "splašky(sewage)"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2337
 msgid "heat"
 msgstr "teplo(heat)"
 
-#: build/trans_presets.java:2348
+#: build/trans_presets.java:2337
 msgid "any substance"
 msgstr "nejaké látky(any substance)"
 
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2338
 msgid "underwater"
 msgstr "podvodné(underwater)"
 
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2338
 msgid "overground"
 msgstr "nadzemné(overground)"
 
-#: build/trans_presets.java:2351
+#: build/trans_presets.java:2340
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -21734,10 +22314,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:2355
+#: build/trans_presets.java:2344
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2359
+#: build/trans_presets.java:2348
 msgid "Crane"
 msgstr "Žeriav"
@@ -21745,10 +22325,10 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2350
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2365
+#: build/trans_presets.java:2354
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -21756,10 +22336,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2367
+#: build/trans_presets.java:2356
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2360
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -21767,10 +22347,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2373
+#: build/trans_presets.java:2362
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2377
+#: build/trans_presets.java:2366
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -21778,5 +22358,5 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2368
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
@@ -21784,5 +22364,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2373
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -21792,35 +22372,35 @@
 #. 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:2388
+#: build/trans_presets.java:2377
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2379
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2379
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2379
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2379
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2379
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2379
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2393
+#: build/trans_presets.java:2382
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -21829,10 +22409,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:2396
+#: build/trans_presets.java:2385
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2391
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -21841,5 +22421,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:2405
+#: build/trans_presets.java:2394
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -21847,10 +22427,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2408 build/trans_presets.java:2425
+#: build/trans_presets.java:2397 build/trans_presets.java:2414
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2399
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -21861,23 +22441,23 @@
 #. 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:2415
+#: build/trans_presets.java:2404
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2405
 msgid "tower"
 msgstr "veža"
 
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2405
 msgid "pole"
 msgstr "stožiar(pole)"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2406
 msgid "Tower reference"
 msgstr "Nastavenie veže"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:2408
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -21886,75 +22466,75 @@
 #. <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:2422
+#: build/trans_presets.java:2411
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2412
 msgid "Line type"
 msgstr "Typ vedenia"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2412
 msgid "line"
 msgstr "vedenie"
 
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2412
 msgid "minor_line"
 msgstr "vedľajšie_vedenie"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2415
 msgid "Voltage"
 msgstr "Napätie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2416
 msgid "Amount of Cables"
 msgstr "Počet káblov"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2417
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Počet vodičov (lepší: vodič) pre napájacie káble"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2417
 msgid "single"
 msgstr "jedno"
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2417
 msgid "double"
 msgstr "dvojité"
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2417
 msgid "triple"
 msgstr "trojité"
 
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2417
 msgid "quad"
 msgstr "štvorité"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2420
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2432
+#: build/trans_presets.java:2421
 msgid "Toilets"
 msgstr "Toalety"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2439 build/trans_presets.java:2555
+#: build/trans_presets.java:2428 build/trans_presets.java:2558
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2430
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2435
 msgid "Telephone"
 msgstr "Telefón"
@@ -21963,5 +22543,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:2449
+#: build/trans_presets.java:2438
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -21969,5 +22549,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2452 build/trans_presets.java:2556
+#: build/trans_presets.java:2441 build/trans_presets.java:2559
 msgid "Coins"
 msgstr "Mince"
@@ -21975,5 +22555,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2453 build/trans_presets.java:2557
+#: build/trans_presets.java:2442 build/trans_presets.java:2560
 msgid "Notes"
 msgstr "Bankovky"
@@ -21981,5 +22561,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2454 build/trans_presets.java:2558
+#: build/trans_presets.java:2443 build/trans_presets.java:2561
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -21987,5 +22567,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2455 build/trans_presets.java:2559
+#: build/trans_presets.java:2444 build/trans_presets.java:2562
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -21993,15 +22573,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2456 build/trans_presets.java:2560
+#: build/trans_presets.java:2445 build/trans_presets.java:2563
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2446
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2448
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -22010,5 +22590,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:2462
+#: build/trans_presets.java:2451
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -22016,68 +22596,63 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2464
+#: build/trans_presets.java:2453
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2465
+#: build/trans_presets.java:2454
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2466
+#: build/trans_presets.java:2455
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2456
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2457
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2458
 msgid "Scrap Metal"
 msgstr "Železný šrot"
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2471
-msgid "Bench"
-msgstr "Lavička"
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2463
 msgid "Backrest"
 msgstr "Oreradlo chrbta (Backrest)"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2464
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2464
 msgid "stone"
 msgstr "kameň"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2464
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2465
 msgid "Colour"
 msgstr "Farba"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2465
 msgid "black"
 msgstr "čierna"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2465
 msgid "brown"
 msgstr "hnedá"
@@ -22148,39 +22723,39 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2476 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3087
-#: build/trans_style.java:3095 build/trans_style.java:3143
-#: build/trans_style.java:3151 build/trans_style.java:3249
-#: build/trans_style.java:3257
+#: build/trans_presets.java:2465 build/trans_style.java:3087
+#: build/trans_style.java:3095 build/trans_style.java:3103
+#: build/trans_style.java:3111 build/trans_style.java:3159
+#: build/trans_style.java:3167 build/trans_style.java:3265
+#: build/trans_style.java:3273
 msgid "green"
 msgstr "zelená"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2465
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2465
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2465
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2465
 msgid "white"
 msgstr "biela"
 
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2466
 msgid "Amount of Seats"
 msgstr "Počet sedadiel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2468
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2469
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
@@ -22189,30 +22764,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2482 build/trans_presets.java:2944
+#: build/trans_presets.java:2471 build/trans_presets.java:2947
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2471
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2471
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2482
+#: build/trans_presets.java:2471
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2484
+#: build/trans_presets.java:2473
 msgid "Hide"
 msgstr "Skryť"
 
-#: build/trans_presets.java:2485
+#: build/trans_presets.java:2474
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2476
 msgid "Fountain"
 msgstr "Fontána"
@@ -22221,10 +22796,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:2490
+#: build/trans_presets.java:2479
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2483
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -22233,10 +22808,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:2497
+#: build/trans_presets.java:2486
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2490
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -22244,33 +22819,57 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2503
+#: build/trans_presets.java:2492
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2498
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2510
+#: build/trans_presets.java:2499
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Shops/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:2501
+msgid "Edit Car Shop"
+msgstr "Upraviť obchod s autami"
+
+#. item "Shops/Car Dealer" text "Operator"
+#: build/trans_presets.java:2506
+#, fuzzy
+msgid "Bike Dealer"
+msgstr "Lake Walker"
+
+#. item "Shops/Bike Dealer"
+#. <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:2509
+msgid "Edit Bicycle Shop"
+msgstr "Upraviť bicyklový obchod"
+
+#. item "Shops/Bike Dealer" text "Name"
+#: build/trans_presets.java:2513
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2514
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2519
 msgid "Chemist"
 msgstr "Lekáreň"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2517
+#: build/trans_presets.java:2520
 msgid "Edit Chemist"
 msgstr "Upraviť lekáreň"
 
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2525
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -22278,9 +22877,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2527
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2532
 msgid "Kiosk"
 msgstr "Stánok"
@@ -22288,27 +22887,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2534
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2539
 msgid "Book Store"
 msgstr "Kníhkupectvo"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2540
 msgid "Edit Book Store"
 msgstr "Upraviť kníhkupectvo"
 
-#: build/trans_presets.java:2542
+#: build/trans_presets.java:2545
 msgid "Travel Agency"
 msgstr "Cestovná kancelária"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2546
 msgid "Edit Travel Agency"
 msgstr "Upraviť cestovnú kanceláciu"
 
-#: build/trans_presets.java:2548
+#: build/trans_presets.java:2551
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -22316,5 +22915,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2553
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -22322,88 +22921,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2555
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2561
+#: build/trans_presets.java:2564
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2566
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -22411,9 +23010,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2568
 msgid "Edit Butcher"
 msgstr "Upraviť mäsiarstvo"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2573
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -22421,9 +23020,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2575
 msgid "Edit Baker"
 msgstr "Upraviť chlieb a pečivo"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2580
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -22431,18 +23030,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2582
 msgid "Edit Florist"
 msgstr "Upraviť kvetinárstvo"
 
-#: build/trans_presets.java:2584
+#: build/trans_presets.java:2587
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2588
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2593
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -22450,54 +23049,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2592
+#: build/trans_presets.java:2595
 msgid "Edit Alcohol Shop"
 msgstr "Upraviť Obchod s alkoholickými nápojmi"
 
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2600
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2598
+#: build/trans_presets.java:2601
 msgid "Edit Beverages Shop"
 msgstr "Upraviť Obchod s nápojmi."
 
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2606
 msgid "Computer"
 msgstr "Počítač"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2604
+#: build/trans_presets.java:2607
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
-#: build/trans_presets.java:2609
+#: build/trans_presets.java:2612
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2613
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
-#: build/trans_presets.java:2615
+#: build/trans_presets.java:2618
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2619
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
-#: build/trans_presets.java:2621
+#: build/trans_presets.java:2624
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2622
+#: build/trans_presets.java:2625
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
-#: build/trans_presets.java:2627
+#: build/trans_presets.java:2630
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -22505,9 +23104,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2629
+#: build/trans_presets.java:2632
 msgid "Edit Garden Centre"
 msgstr "Upraviť záhradné centrum"
 
-#: build/trans_presets.java:2634
+#: build/trans_presets.java:2637
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -22515,9 +23114,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2639
 msgid "Edit Hardware Store"
 msgstr "Upraviť železiarstvo"
 
-#: build/trans_presets.java:2641
+#: build/trans_presets.java:2644
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -22525,54 +23124,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2646
 msgid "Edit Do-it-yourself-store"
 msgstr "Upraviť obchod Urob si sám"
 
-#: build/trans_presets.java:2648
+#: build/trans_presets.java:2651
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:2652
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2657
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2658
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
-#: build/trans_presets.java:2660
+#: build/trans_presets.java:2663
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2664
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
-#: build/trans_presets.java:2666
+#: build/trans_presets.java:2669
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2670
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2675
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2676
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
-#: build/trans_presets.java:2678
+#: build/trans_presets.java:2681
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -22580,9 +23179,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2683
 msgid "Edit Dry Cleaning"
 msgstr "Upraviť chemickú čistiareň"
 
-#: build/trans_presets.java:2685
+#: build/trans_presets.java:2688
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -22590,9 +23189,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2690
 msgid "Edit Laundry"
 msgstr "Upraviť práčovňu"
 
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2695
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -22600,28 +23199,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2697
 msgid "Edit Outdoor Shop"
 msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2700
+#: build/trans_presets.java:2703
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2708
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2709
 msgid "Edit Optician"
 msgstr "Upraviť očnú optiku"
 
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2716
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2717
 msgid "Bank"
 msgstr "Banka"
@@ -22629,14 +23228,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2716
+#: build/trans_presets.java:2719
 msgid "Edit Bank"
 msgstr "Upraviť banku"
 
-#: build/trans_presets.java:2721 build/trans_presets.java:2730
+#: build/trans_presets.java:2724 build/trans_presets.java:2733
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2723
+#: build/trans_presets.java:2726
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -22644,5 +23243,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2725
+#: build/trans_presets.java:2728
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -22650,15 +23249,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2732
+#: build/trans_presets.java:2735
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2740
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2738
+#: build/trans_presets.java:2741
 msgid "Doctors"
 msgstr "Lekári"
@@ -22666,18 +23265,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2740
+#: build/trans_presets.java:2743
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
-#: build/trans_presets.java:2745
+#: build/trans_presets.java:2748
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2746
+#: build/trans_presets.java:2749
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2754
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -22685,5 +23284,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2753
+#: build/trans_presets.java:2756
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -22691,9 +23290,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2758
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
-#: build/trans_presets.java:2759
+#: build/trans_presets.java:2762
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -22701,10 +23300,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2764
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2765
+#: build/trans_presets.java:2768
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -22713,5 +23312,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:2768
+#: build/trans_presets.java:2771
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -22720,20 +23319,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2774
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2775
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2774
+#: build/trans_presets.java:2777
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2778
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -22741,5 +23340,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2778
+#: build/trans_presets.java:2781
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -22748,64 +23347,64 @@
 #. <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:2781
+#: build/trans_presets.java:2784
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2791
 msgid "Geography"
 msgstr "Geografia(Zemepis)"
 
 #. group "Geography"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2792
 msgid "Places"
 msgstr "Miesta"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2793
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2791
+#: build/trans_presets.java:2794
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2799
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2797
+#: build/trans_presets.java:2800
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2805
 msgid "State"
 msgstr "Stav"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2806
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2808
+#: build/trans_presets.java:2811
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2812
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2817
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2815
+#: build/trans_presets.java:2818
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -22813,15 +23412,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2824
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2822
+#: build/trans_presets.java:2825
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2827
+#: build/trans_presets.java:2830
 msgid "Town"
 msgstr "Mesto (town)"
@@ -22829,10 +23428,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2832
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2837
 msgid "Suburb"
 msgstr "Štvrť"
@@ -22840,25 +23439,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2839
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:2844
 msgid "Village"
 msgstr "Dedina"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2845
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2850
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2848
+#: build/trans_presets.java:2851
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -22866,5 +23465,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2857
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -22872,10 +23471,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2859
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2861
+#: build/trans_presets.java:2864
 msgid "Island"
 msgstr "Ostrov"
@@ -22883,10 +23482,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2866
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2868
+#: build/trans_presets.java:2871
 msgid "Islet"
 msgstr "Ostrovček"
@@ -22894,5 +23493,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2873
 msgid "Edit Islet"
 msgstr "Upraviť ostrovček"
@@ -22900,5 +23499,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2879
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -22906,10 +23505,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:2881
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2885
 msgid "Peak"
 msgstr "Vrchol"
@@ -22917,10 +23516,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:2887
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2892
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -22928,10 +23527,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2894
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2899
 msgid "Volcano"
 msgstr "Sopka"
@@ -22939,70 +23538,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2901
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:2907
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2908
 msgid "National"
 msgstr "Štátna"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2906
+#: build/trans_presets.java:2909
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2914
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2912
+#: build/trans_presets.java:2915
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2920
 msgid "Civil"
 msgstr "Občianske"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2918
+#: build/trans_presets.java:2921
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2926
 msgid "Political"
 msgstr "Politická"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2927
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2932
 msgid "National park"
 msgstr "Národný park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2930
+#: build/trans_presets.java:2933
 msgid "Edit National Park Boundary"
 msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:2939
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2937
+#: build/trans_presets.java:2940
 msgid "Tree"
 msgstr "Strom"
@@ -23011,15 +23610,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:2940
+#: build/trans_presets.java:2943
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2945
+#: build/trans_presets.java:2948
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2950
 msgid "Wood"
 msgstr "Drevo"
@@ -23028,5 +23627,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:2950
+#: build/trans_presets.java:2953
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -23034,17 +23633,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2953 build/trans_presets.java:2962
+#: build/trans_presets.java:2956 build/trans_presets.java:2965
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:2953 build/trans_presets.java:2962
+#: build/trans_presets.java:2956 build/trans_presets.java:2965
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2953 build/trans_presets.java:2962
+#: build/trans_presets.java:2956 build/trans_presets.java:2965
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:2955
+#: build/trans_presets.java:2958
 msgid "Forest"
 msgstr "Les"
@@ -23053,14 +23652,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:2958
+#: build/trans_presets.java:2961
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2967
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2968
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -23068,25 +23667,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2970
+#: build/trans_presets.java:2973
 msgid "Scree"
 msgstr "Sutina"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2974
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2978
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:2979
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2983
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -23094,5 +23693,5 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2985
 msgid "Edit Fell"
 msgstr ""
@@ -23100,5 +23699,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2986
+#: build/trans_presets.java:2989
 msgid "Heath"
 msgstr "Vresovisko"
@@ -23106,5 +23705,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2988
+#: build/trans_presets.java:2991
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
@@ -23112,5 +23711,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2996
 msgid "Farmyard"
 msgstr "Farma"
@@ -23119,45 +23718,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:2996
+#: build/trans_presets.java:2999
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3004
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3005
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3010
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3011
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3016
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3014
+#: build/trans_presets.java:3017
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3019
+#: build/trans_presets.java:3022
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3020
+#: build/trans_presets.java:3023
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -23165,25 +23764,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3026
+#: build/trans_presets.java:3029
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3030
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3034
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3032
+#: build/trans_presets.java:3035
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3040
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -23191,10 +23790,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3039
+#: build/trans_presets.java:3042
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3047
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -23202,20 +23801,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3049
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3053
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3054
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3058
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -23223,5 +23822,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3060
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -23229,15 +23828,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3066
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3067
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3072
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -23245,9 +23844,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3071
+#: build/trans_presets.java:3074
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3080
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -23255,39 +23854,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3082
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3089
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3087
+#: build/trans_presets.java:3090
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3095
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3093
+#: build/trans_presets.java:3096
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3101
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3102
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3107
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -23295,15 +23894,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3109
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3111
+#: build/trans_presets.java:3114
 msgid "Military"
 msgstr "Armáda"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3115
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -23311,55 +23910,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:3121
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:3122
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3127
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3125
+#: build/trans_presets.java:3128
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3130
+#: build/trans_presets.java:3133
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3131
+#: build/trans_presets.java:3134
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3139
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3137
+#: build/trans_presets.java:3140
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3145
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3143
+#: build/trans_presets.java:3146
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
 
 #. group "Relations"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3155
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -23369,5 +23968,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:3156
+#: build/trans_presets.java:3159
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -23376,10 +23975,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3162
+#: build/trans_presets.java:3165
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3163
+#: build/trans_presets.java:3166
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -23387,5 +23986,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3169
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -23394,5 +23993,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3169
+#: build/trans_presets.java:3172
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -23400,34 +23999,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3174
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3174
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3174
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3174
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3174
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3174
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3174
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3174
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -23436,15 +24035,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3176
+#: build/trans_presets.java:3179
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3180
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3181
 msgid "to way"
 msgstr "k ceste"
@@ -23452,5 +24051,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3181
+#: build/trans_presets.java:3184
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -23459,5 +24058,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3184
+#: build/trans_presets.java:3187
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -23465,5 +24064,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -23535,24 +24134,24 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3186 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
-#: build/trans_style.java:930 build/trans_style.java:938
+#: build/trans_presets.java:3189 build/trans_style.java:233
+#: build/trans_style.java:683 build/trans_style.java:877
+#: build/trans_style.java:885 build/trans_style.java:893
+#: build/trans_style.java:901 build/trans_style.java:909
 msgid "bicycle"
 msgstr "bicykel"
 
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "ski"
 msgstr "lyžovanie"
@@ -23605,5 +24204,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3186 build/trans_style.java:247
+#: build/trans_presets.java:3189 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
@@ -23612,13 +24211,13 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "hiking"
 msgstr "turistika"
 
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3189
 msgid "detour"
 msgstr "obchádzka"
@@ -23632,10 +24231,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3186 build/trans_style.java:1206
+#: build/trans_presets.java:3189 build/trans_style.java:1161
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3189
+#: build/trans_presets.java:3192
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -23643,31 +24242,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3192
+#: build/trans_presets.java:3195
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3197
 msgid "Route state"
 msgstr "Štátna cesta"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3197
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3197
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3197
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3194
+#: build/trans_presets.java:3197
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3195
+#: build/trans_presets.java:3198
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -23676,30 +24275,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3201
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3199
+#: build/trans_presets.java:3202
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3200
+#: build/trans_presets.java:3203
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3204
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3202
+#: build/trans_presets.java:3205
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3203
+#: build/trans_presets.java:3206
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -23910,130 +24509,4 @@
 #. <rule>
 #. <condition k="highway" v="road"/>
-#. color rail
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>10000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="direction" v="clockwise"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="mini_roundabout"/>
-#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
-#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="stop"/>
-#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="traffic_signals"/>
-#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="street_lamp"/>
-#. <icon annotate="true" src="misc/streetlamp.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="speed_camera"/>
-#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="traffic_sign" v="city_limit"/>
-#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="crossing"/>
-#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="gate"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="cattle_grid"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="toll_booth"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="incline_steep"/>
-#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="highway" v="viaduct"/>
-#. color railwaypoint
-#. <icon annotate="true" src="transport/underground.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="railway" v="viaduct"/>
-#. color amenity_light
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <!-- deprecated; use information=guidepost instead -->
-#. <condition k="amenity" v="signpost"/>
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. color woodarea
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="natural" v="marsh"/>
-#. <icon src="misc/deprecated.png"/>
-#. color deprecated
 #. color sport
 #. <icon annotate="true" src="sport/fishing.png"/>
@@ -24050,98 +24523,7 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#. color service
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!--"deprecated" tags -->
-#.
-#. <!-- historic=museum -> tourism=museum -->
-#. <rule>
-#. <condition k="historic" v="museum"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- man_made=power_wind -> power=generator and power_source=wind -->
-#. <rule>
-#. <condition k="man_made" v="power_wind"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- man_made=power_hydro -> power=generator and power_source=hydro -->
-#. <rule>
-#. <condition k="man_made" v="power_hydro"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- man_made=power_fossil -> power=generator and power_source=fossil -->
-#. <rule>
-#. <condition k="man_made" v="power_fossil"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- man_made=power_nuclear -> power=generator and power_source=nuclear -->
-#. <rule>
-#. <condition k="man_made" v="power_nuclear"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- highway classification now more detailed -->
-#. <rule>
-#. <condition k="highway" v="minor"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!-- amenity=park_bench -> amenity=bench -->
-#. <rule>
-#. <condition k="amenity" v="park_bench"/>
-#. color deprecated
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- highway=stile -> barrier=stile -->
-#. <rule>
-#. <condition k="highway" v="stile"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- there's a bit confusion about this tag, the proposal says leisure, map features say tourism ?!? -->
-#. <rule>
-#. <condition k="leisure" v="zoo"/>
 #: build/trans_style.java:139 build/trans_style.java:174
 #: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:627 build/trans_style.java:824
-#: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3391 build/trans_style.java:3392
-#: build/trans_style.java:3962 build/trans_style.java:4270
-#: build/trans_style.java:4279 build/trans_style.java:4288
-#: build/trans_style.java:4297 build/trans_style.java:4306
-#: build/trans_style.java:4315 build/trans_style.java:4324
-#: build/trans_style.java:4325 build/trans_style.java:4334
-#: build/trans_style.java:4343
+#: build/trans_style.java:627 build/trans_style.java:3969
 msgid "deprecated"
 msgstr "zastaralý"
@@ -24518,7 +24900,7 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:643 build/trans_style.java:948
-#: build/trans_style.java:956 build/trans_style.java:964
-#: build/trans_style.java:972 build/trans_style.java:980
+#: build/trans_style.java:643 build/trans_style.java:919
+#: build/trans_style.java:927 build/trans_style.java:935
+#: build/trans_style.java:943 build/trans_style.java:951
 msgid "highway_track"
 msgstr "cesta (highway_track)"
@@ -24582,13 +24964,92 @@
 #. <icon annotate="true" src="misc/deprecated.png"/>
 #. color rail
-#: build/trans_style.java:724 build/trans_style.java:1180
-#: build/trans_style.java:1244 build/trans_style.java:1252
-#: build/trans_style.java:1261 build/trans_style.java:1269
-#: build/trans_style.java:1277 build/trans_style.java:1278
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
+#: build/trans_style.java:724 build/trans_style.java:1135
+#: build/trans_style.java:1199 build/trans_style.java:1207
+#: build/trans_style.java:1216 build/trans_style.java:1224
+#: build/trans_style.java:1232 build/trans_style.java:1233
+#: build/trans_style.java:1240
 msgid "rail"
 msgstr "koľajnica (rail)"
 
-#. color deprecated
+#. color rail
 #. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="direction" v="clockwise"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_left.png" priority="10000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="mini_roundabout"/>
+#. <icon annotate="true" src="vehicle/restriction/roundabout_right.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/roundabout_left.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="stop"/>
+#. <icon annotate="true" src="vehicle/restriction/stop.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="traffic_signals"/>
+#. <icon annotate="true" src="vehicle/restriction/traffic-light.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="street_lamp"/>
+#. <icon annotate="true" src="misc/streetlamp.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="speed_camera"/>
+#. <icon annotate="true" src="vehicle/restriction/speed_trap.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="traffic_sign" v="city_limit"/>
+#. <icon annotate="true" src="vehicle/restriction/citylimit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="crossing"/>
+#. <icon annotate="true" src="vehicle/zebra_crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="incline_steep"/>
+#. <icon annotate="true" src="vehicle/restriction/incline.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -24604,5 +25065,5 @@
 #. <rule>
 #. <condition k="highway" v="services"/>
-#: build/trans_style.java:839
+#: build/trans_style.java:810
 msgid "services"
 msgstr "služby"
@@ -24616,5 +25077,5 @@
 #. <rule>
 #. <condition k="highway" v="ford"/>
-#: build/trans_style.java:847
+#: build/trans_style.java:818
 msgid "ford"
 msgstr "brod"
@@ -24635,5 +25096,5 @@
 #. <rule>
 #. <condition k="highway" v="turning_circle"/>
-#: build/trans_style.java:862
+#: build/trans_style.java:833
 msgid "turningcircle"
 msgstr "turningcircle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -24648,5 +25109,5 @@
 #. <condition k="highway" v="emergency_access_point"/>
 #. <icon src="service/emergency_access_point.png"/>
-#: build/trans_style.java:886
+#: build/trans_style.java:857
 msgid "emergency_access_point"
 msgstr "miesto pohotovostnej prvej pomoci"
@@ -24661,5 +25122,5 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:998 build/trans_style.java:999
+#: build/trans_style.java:969 build/trans_style.java:970
 msgid "riverbank"
 msgstr "riečny breh"
@@ -24673,5 +25134,5 @@
 #. <rule>
 #. <condition k="waterway" v="stream"/>
-#: build/trans_style.java:1015
+#: build/trans_style.java:986
 msgid "stream"
 msgstr "potok"
@@ -24685,5 +25146,5 @@
 #. <rule>
 #. <condition k="waterway" v="dock"/>
-#: build/trans_style.java:1031
+#: build/trans_style.java:1002
 msgid "dock"
 msgstr "dok (nakladacia rampa)"
@@ -24705,16 +25166,4 @@
 #. <condition k="waterway" v="turning_point"/>
 #. <icon annotate="true" src="nautical/turning.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <rule>
-#. <condition k="waterway" v="aqueduct"/>
-#: build/trans_style.java:1053
-msgid "aqueduct"
-msgstr "akvadukt"
-
-#. color aqueduct
-#. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -24811,4 +25260,11 @@
 #.
 #. <rule>
+#. <condition k="man_made" v="petroleum_well"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="man_made" v="reservoir_covered"/>
 #. <icon annotate="true" src="misc/landmark/reservoir_covered.png"/>
@@ -24877,13 +25333,13 @@
 #. <condition k="man_made" v="works"/>
 #. <icon annotate="true" src="misc/landmark/works.png"/>
-#: build/trans_style.java:1062 build/trans_style.java:1091
-#: build/trans_style.java:1099 build/trans_style.java:1100
-#: build/trans_style.java:1108 build/trans_style.java:1578
-#: build/trans_style.java:1585 build/trans_style.java:1594
-#: build/trans_style.java:1602 build/trans_style.java:1627
-#: build/trans_style.java:1635 build/trans_style.java:1643
-#: build/trans_style.java:1651 build/trans_style.java:1658
-#: build/trans_style.java:1667 build/trans_style.java:1675
-#: build/trans_style.java:1683 build/trans_style.java:1691
+#: build/trans_style.java:1025 build/trans_style.java:1054
+#: build/trans_style.java:1062 build/trans_style.java:1063
+#: build/trans_style.java:1071 build/trans_style.java:1548
+#: build/trans_style.java:1555 build/trans_style.java:1564
+#: build/trans_style.java:1572 build/trans_style.java:1604
+#: build/trans_style.java:1612 build/trans_style.java:1620
+#: build/trans_style.java:1628 build/trans_style.java:1635
+#: build/trans_style.java:1644 build/trans_style.java:1652
+#: build/trans_style.java:1660 build/trans_style.java:1668
 msgid "manmade"
 msgstr "človekom vytvorené (manmade)"
@@ -24929,6 +25385,6 @@
 #. <rule>
 #. <condition k="railway" v="subway_entrance"/>
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/underground.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -24945,7 +25401,7 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1118 build/trans_style.java:1133
-#: build/trans_style.java:1148 build/trans_style.java:1164
-#: build/trans_style.java:1172
+#: build/trans_style.java:1081 build/trans_style.java:1096
+#: build/trans_style.java:1111 build/trans_style.java:1119
+#: build/trans_style.java:1127
 msgid "railwaypoint"
 msgstr "železničná výhybka"
@@ -24968,10 +25424,10 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1189 build/trans_style.java:1198
+#: build/trans_style.java:1144 build/trans_style.java:1153
 msgid "otherrail"
 msgstr "iná koľaj"
 
 #. color otherrail
-#: build/trans_style.java:1190
+#: build/trans_style.java:1145
 msgid "railover"
 msgstr "nadchod nad železnicou"
@@ -25007,11 +25463,12 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1214 build/trans_style.java:1224
-#: build/trans_style.java:1225 build/trans_style.java:1235
-#: build/trans_style.java:1236
+#: build/trans_style.java:1169 build/trans_style.java:1179
+#: build/trans_style.java:1180 build/trans_style.java:1190
+#: build/trans_style.java:1191
 msgid "oldrail"
 msgstr "historická železnica(turistická)"
 
 #. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25052,6 +25509,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1308 build/trans_style.java:1309
-#: build/trans_style.java:1341
+#: build/trans_style.java:1271 build/trans_style.java:1272
+#: build/trans_style.java:1304
 msgid "aeroway"
 msgstr "letecké cesty"
@@ -25065,5 +25522,5 @@
 #. <rule>
 #. <condition k="aeroway" v="terminal"/>
-#: build/trans_style.java:1317
+#: build/trans_style.java:1280
 msgid "terminal"
 msgstr "terminál"
@@ -25085,5 +25542,5 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1325 build/trans_style.java:1333
+#: build/trans_style.java:1288 build/trans_style.java:1296
 msgid "aeroway_dark"
 msgstr "zjazdovka_čierna"
@@ -25097,5 +25554,5 @@
 #. <rule>
 #. <condition k="aeroway" v="apron"/>
-#: build/trans_style.java:1349
+#: build/trans_style.java:1312
 msgid "aeroway_light"
 msgstr "zjazdovka_ľahká"
@@ -25103,4 +25560,11 @@
 #. color aeroway_light
 #. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="gate"/>
+#. <icon annotate="true" src="transport/airport/terminal.png"/>
 #. <scale_min>1</scale_min>
 #. <scale_max>50000</scale_max>
@@ -25150,7 +25614,7 @@
 #. <rule>
 #. <condition k="aerialway" v="station"/>
-#: build/trans_style.java:1366 build/trans_style.java:1374
-#: build/trans_style.java:1382 build/trans_style.java:1390
-#: build/trans_style.java:1398
+#: build/trans_style.java:1336 build/trans_style.java:1344
+#: build/trans_style.java:1352 build/trans_style.java:1360
+#: build/trans_style.java:1368
 msgid "aerialway"
 msgstr "Visuté cesty/Lanovky"
@@ -25167,5 +25631,5 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1408 build/trans_style.java:1409
+#: build/trans_style.java:1378 build/trans_style.java:1379
 msgid "piste_easy"
 msgstr "mierna zjazdovka (piste_easy)"
@@ -25180,5 +25644,5 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1417 build/trans_style.java:1418
+#: build/trans_style.java:1387 build/trans_style.java:1388
 msgid "piste_intermediate"
 msgstr "stredne ťažká zjazdovka (piste_intermediate)"
@@ -25193,5 +25657,5 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1426 build/trans_style.java:1427
+#: build/trans_style.java:1396 build/trans_style.java:1397
 msgid "piste_advanced"
 msgstr "zjazdovka pre pokročilých (piste_advanced)"
@@ -25206,5 +25670,5 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1435 build/trans_style.java:1436
+#: build/trans_style.java:1405 build/trans_style.java:1406
 msgid "piste_expert"
 msgstr "zjazdovka pre expertov (piste_expert)"
@@ -25219,5 +25683,5 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1444 build/trans_style.java:1445
+#: build/trans_style.java:1414 build/trans_style.java:1415
 msgid "piste_freeride"
 msgstr "zjazdovka pre freeride (piste_freeride)"
@@ -25232,5 +25696,5 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1453 build/trans_style.java:1454
+#: build/trans_style.java:1423 build/trans_style.java:1424
 msgid "piste_novice"
 msgstr "zjazdovka pre začiatočníkov (piste_novice)"
@@ -25350,11 +25814,11 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1465 build/trans_style.java:1479
-#: build/trans_style.java:1487 build/trans_style.java:1496
-#: build/trans_style.java:1504 build/trans_style.java:1512
-#: build/trans_style.java:1520 build/trans_style.java:1528
-#: build/trans_style.java:1536 build/trans_style.java:1544
-#: build/trans_style.java:1552 build/trans_style.java:1560
-#: build/trans_style.java:1568
+#: build/trans_style.java:1435 build/trans_style.java:1449
+#: build/trans_style.java:1457 build/trans_style.java:1466
+#: build/trans_style.java:1474 build/trans_style.java:1482
+#: build/trans_style.java:1490 build/trans_style.java:1498
+#: build/trans_style.java:1506 build/trans_style.java:1514
+#: build/trans_style.java:1522 build/trans_style.java:1530
+#: build/trans_style.java:1538
 msgid "power"
 msgstr "energia (power)"
@@ -25368,5 +25832,5 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1609 build/trans_style.java:1610
+#: build/trans_style.java:1579 build/trans_style.java:1580
 msgid "pier"
 msgstr "hrádza (pier)"
@@ -25380,5 +25844,5 @@
 #. <rule>
 #. <condition k="man_made" v="pipeline"/>
-#: build/trans_style.java:1618
+#: build/trans_style.java:1588
 msgid "pipeline"
 msgstr "potrubie (pipeline)"
@@ -25506,12 +25970,29 @@
 #. <condition k="leisure" v="miniature_golf"/>
 #. <icon annotate="true" src="sport/golf.png"/>
-#: build/trans_style.java:1701 build/trans_style.java:1709
-#: build/trans_style.java:1717 build/trans_style.java:1725
-#: build/trans_style.java:1733 build/trans_style.java:1741
-#: build/trans_style.java:1757 build/trans_style.java:1765
-#: build/trans_style.java:1773 build/trans_style.java:1781
-#: build/trans_style.java:1789 build/trans_style.java:1797
-#: build/trans_style.java:1805 build/trans_style.java:1813
-#: build/trans_style.java:1821
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="dog_park"/>
+#. <icon annotate="true" src="leisure/dog.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="ice_rink"/>
+#. <icon annotate="true" src="sport/hockey.png"/>
+#: build/trans_style.java:1678 build/trans_style.java:1686
+#: build/trans_style.java:1694 build/trans_style.java:1702
+#: build/trans_style.java:1710 build/trans_style.java:1718
+#: build/trans_style.java:1734 build/trans_style.java:1742
+#: build/trans_style.java:1750 build/trans_style.java:1758
+#: build/trans_style.java:1766 build/trans_style.java:1774
+#: build/trans_style.java:1782 build/trans_style.java:1790
+#: build/trans_style.java:1798 build/trans_style.java:1806
+#: build/trans_style.java:1814
 msgid "leisure"
 msgstr "oddych (leisure)"
@@ -25525,5 +26006,5 @@
 #. <condition k="leisure" v="marina"/>
 #. <icon annotate="true" src="nautical/marina.png"/>
-#: build/trans_style.java:1749
+#: build/trans_style.java:1726
 msgid "marina"
 msgstr "prístav (marina)"
@@ -25561,4 +26042,20 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="stripclub"/>
+#. <icon annotate="true" src="leisure/stripclub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="brothel"/>
+#. <icon annotate="true" src="leisure/stripclub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="cafe"/>
 #. <icon annotate="true" src="food/cafe.png"/>
@@ -25577,4 +26074,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="food_court"/>
+#. <icon annotate="true" src="food/restaurant.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="fast_food"/>
 #. <icon annotate="true" src="food/fastfood.png"/>
@@ -25595,8 +26100,10 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1831 build/trans_style.java:1839
-#: build/trans_style.java:1847 build/trans_style.java:1855
-#: build/trans_style.java:1863 build/trans_style.java:1871
-#: build/trans_style.java:1879 build/trans_style.java:1887
+#: build/trans_style.java:1824 build/trans_style.java:1832
+#: build/trans_style.java:1840 build/trans_style.java:1848
+#: build/trans_style.java:1856 build/trans_style.java:1864
+#: build/trans_style.java:1872 build/trans_style.java:1880
+#: build/trans_style.java:1888 build/trans_style.java:1896
+#: build/trans_style.java:1904
 msgid "amenity"
 msgstr "zaujímavosti (amenity)"
@@ -25698,10 +26205,10 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1895 build/trans_style.java:1903
-#: build/trans_style.java:1911 build/trans_style.java:1919
-#: build/trans_style.java:1927 build/trans_style.java:1935
-#: build/trans_style.java:1943 build/trans_style.java:1951
-#: build/trans_style.java:1959 build/trans_style.java:1966
-#: build/trans_style.java:1975 build/trans_style.java:1983
+#: build/trans_style.java:1912 build/trans_style.java:1920
+#: build/trans_style.java:1928 build/trans_style.java:1936
+#: build/trans_style.java:1944 build/trans_style.java:1952
+#: build/trans_style.java:1960 build/trans_style.java:1968
+#: build/trans_style.java:1976 build/trans_style.java:1983
+#: build/trans_style.java:1992 build/trans_style.java:2000
 msgid "amenity_traffic"
 msgstr "verejná_doprava"
@@ -25955,5 +26462,5 @@
 #. <rule>
 #. <condition k="amenity" v="driving_school"/>
-#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <icon annotate="true" src="education/driving_school.png"/>
 #. color health
 #. <icon annotate="true" src="health/veterinary.png"/>
@@ -26099,4 +26606,12 @@
 #.
 #. <rule>
+#. <condition k="amenity" v="marketplace"/>
+#. color amenity_light
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
 #. <condition k="amenity" v="wlan"/>
 #. <icon annotate="true" src="wlan.png"/>
@@ -26116,23 +26631,23 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:1991 build/trans_style.java:2006
-#: build/trans_style.java:2014 build/trans_style.java:2022
-#: build/trans_style.java:2037 build/trans_style.java:2045
-#: build/trans_style.java:2053 build/trans_style.java:2061
-#: build/trans_style.java:2176 build/trans_style.java:2184
-#: build/trans_style.java:2191 build/trans_style.java:2200
-#: build/trans_style.java:2208 build/trans_style.java:2216
-#: build/trans_style.java:2224 build/trans_style.java:2232
-#: build/trans_style.java:2240 build/trans_style.java:2248
-#: build/trans_style.java:2311 build/trans_style.java:2319
-#: build/trans_style.java:2327 build/trans_style.java:2336
-#: build/trans_style.java:2344 build/trans_style.java:2351
-#: build/trans_style.java:2359 build/trans_style.java:2367
-#: build/trans_style.java:2375 build/trans_style.java:2383
-#: build/trans_style.java:2391 build/trans_style.java:2399
-#: build/trans_style.java:2407 build/trans_style.java:2415
-#: build/trans_style.java:2423 build/trans_style.java:2431
-#: build/trans_style.java:2439 build/trans_style.java:2448
-#: build/trans_style.java:2463
+#: build/trans_style.java:2008 build/trans_style.java:2023
+#: build/trans_style.java:2031 build/trans_style.java:2039
+#: build/trans_style.java:2054 build/trans_style.java:2062
+#: build/trans_style.java:2070 build/trans_style.java:2078
+#: build/trans_style.java:2193 build/trans_style.java:2201
+#: build/trans_style.java:2208 build/trans_style.java:2217
+#: build/trans_style.java:2225 build/trans_style.java:2233
+#: build/trans_style.java:2241 build/trans_style.java:2249
+#: build/trans_style.java:2257 build/trans_style.java:2265
+#: build/trans_style.java:2328 build/trans_style.java:2336
+#: build/trans_style.java:2344 build/trans_style.java:2353
+#: build/trans_style.java:2361 build/trans_style.java:2368
+#: build/trans_style.java:2376 build/trans_style.java:2384
+#: build/trans_style.java:2392 build/trans_style.java:2400
+#: build/trans_style.java:2408 build/trans_style.java:2416
+#: build/trans_style.java:2424 build/trans_style.java:2432
+#: build/trans_style.java:2440 build/trans_style.java:2448
+#: build/trans_style.java:2456 build/trans_style.java:2464
+#: build/trans_style.java:2473 build/trans_style.java:2488
 msgid "amenity_light"
 msgstr "svetelné zariadenie"
@@ -26164,6 +26679,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3310
+#: build/trans_style.java:2086 build/trans_style.java:2094
+#: build/trans_style.java:3326
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -26224,14 +26739,14 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2255 build/trans_style.java:2263
-#: build/trans_style.java:2271 build/trans_style.java:2280
-#: build/trans_style.java:2287 build/trans_style.java:2295
-#: build/trans_style.java:2303
+#: build/trans_style.java:2272 build/trans_style.java:2280
+#: build/trans_style.java:2288 build/trans_style.java:2297
+#: build/trans_style.java:2304 build/trans_style.java:2312
+#: build/trans_style.java:2320
 msgid "health"
 msgstr "zdravie"
 
-#. color deprecated
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
 #. </rule>
 #.
@@ -26578,5 +27093,4 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2482 build/trans_style.java:2490
 #: build/trans_style.java:2498 build/trans_style.java:2506
 #: build/trans_style.java:2514 build/trans_style.java:2522
@@ -26599,5 +27113,6 @@
 #: build/trans_style.java:2786 build/trans_style.java:2794
 #: build/trans_style.java:2802 build/trans_style.java:2810
-#: build/trans_style.java:2819
+#: build/trans_style.java:2818 build/trans_style.java:2826
+#: build/trans_style.java:2835
 msgid "shop"
 msgstr "obchod"
@@ -26669,8 +27184,8 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2829 build/trans_style.java:2837
 #: build/trans_style.java:2845 build/trans_style.java:2853
 #: build/trans_style.java:2861 build/trans_style.java:2869
 #: build/trans_style.java:2877 build/trans_style.java:2885
+#: build/trans_style.java:2893 build/trans_style.java:2901
 msgid "hotel"
 msgstr "hotel"
@@ -26771,9 +27286,9 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2893 build/trans_style.java:2901
 #: build/trans_style.java:2909 build/trans_style.java:2917
 #: 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:2980
+#: build/trans_style.java:2941 build/trans_style.java:2949
+#: build/trans_style.java:2950 build/trans_style.java:2958
+#: build/trans_style.java:2974 build/trans_style.java:2996
 msgid "tourism"
 msgstr "cestovanie"
@@ -26861,9 +27376,9 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: 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
 #: build/trans_style.java:3054 build/trans_style.java:3062
+#: build/trans_style.java:3070 build/trans_style.java:3078
 msgid "historic"
 msgstr "historické"
@@ -26877,5 +27392,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3103
+#: build/trans_style.java:3119
 msgid "quarry"
 msgstr "lom"
@@ -26889,5 +27404,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3111
+#: build/trans_style.java:3127
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -26909,5 +27424,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3119 build/trans_style.java:3127
+#: build/trans_style.java:3135 build/trans_style.java:3143
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -26921,5 +27436,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3135
+#: build/trans_style.java:3151
 msgid "forest"
 msgstr "les"
@@ -26933,5 +27448,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3167
+#: build/trans_style.java:3183
 msgid "farmyard"
 msgstr "farmy"
@@ -26954,5 +27469,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3176 build/trans_style.java:3184
+#: build/trans_style.java:3192 build/trans_style.java:3200
 msgid "retail"
 msgstr "maloobchody"
@@ -26966,5 +27481,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3208
 msgid "industrial"
 msgstr "závody"
@@ -26978,5 +27493,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3216
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -26990,5 +27505,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3208
+#: build/trans_style.java:3224
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -27002,5 +27517,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3216
+#: build/trans_style.java:3232
 msgid "railland"
 msgstr "železničný pozemok"
@@ -27057,7 +27572,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3233 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3249 build/trans_style.java:3284
 #: build/trans_style.java:3292 build/trans_style.java:3300
+#: build/trans_style.java:3308 build/trans_style.java:3316
 msgid "military"
 msgstr "armáda"
@@ -27071,5 +27586,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3241
+#: build/trans_style.java:3257
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -27082,5 +27597,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3317
+#: build/trans_style.java:3333
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -27095,5 +27610,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3326
+#: build/trans_style.java:3342
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -27107,5 +27622,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3334
+#: build/trans_style.java:3350
 msgid "volcano"
 msgstr "sopka"
@@ -27160,8 +27675,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3342 build/trans_style.java:3343
-#: build/trans_style.java:3351 build/trans_style.java:3367
-#: build/trans_style.java:3440 build/trans_style.java:3448
-#: build/trans_style.java:3456
+#: build/trans_style.java:3358 build/trans_style.java:3359
+#: build/trans_style.java:3367 build/trans_style.java:3383
+#: build/trans_style.java:3447 build/trans_style.java:3455
+#: build/trans_style.java:3463
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -27175,5 +27690,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3375
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -27187,5 +27702,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3375
+#: build/trans_style.java:3391
 msgid "heath"
 msgstr "vresovisko"
@@ -27199,5 +27714,5 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_style.java:3383
+#: build/trans_style.java:3399
 msgid "woodarea"
 msgstr "zalesnená oblasť (woodarea)"
@@ -27211,5 +27726,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3424
+#: build/trans_style.java:3431
 msgid "mud"
 msgstr "blato (mud)"
@@ -27223,5 +27738,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3432
+#: build/trans_style.java:3439
 msgid "beach"
 msgstr "pláž (beach)"
@@ -27299,8 +27814,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: 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
-#: build/trans_style.java:3520 build/trans_style.java:3528
+#: build/trans_style.java:3479 build/trans_style.java:3487
+#: build/trans_style.java:3495 build/trans_style.java:3503
+#: build/trans_style.java:3511 build/trans_style.java:3519
+#: build/trans_style.java:3527 build/trans_style.java:3535
 msgid "route"
 msgstr "trasa (route)"
@@ -27348,7 +27863,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554 build/trans_style.java:3562
-#: build/trans_style.java:3570
+#: build/trans_style.java:3545 build/trans_style.java:3553
+#: build/trans_style.java:3561 build/trans_style.java:3569
+#: build/trans_style.java:3577
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -27498,11 +28013,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: 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 build/trans_style.java:4098
-#: build/trans_style.java:4106
+#: build/trans_style.java:4017 build/trans_style.java:4025
+#: build/trans_style.java:4033 build/trans_style.java:4041
+#: build/trans_style.java:4049 build/trans_style.java:4057
+#: build/trans_style.java:4065 build/trans_style.java:4073
+#: build/trans_style.java:4081 build/trans_style.java:4089
+#: build/trans_style.java:4097 build/trans_style.java:4105
+#: build/trans_style.java:4113
 msgid "place"
 msgstr "miesto"
@@ -27550,6 +28065,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4223 build/trans_style.java:4230
-#: build/trans_style.java:4237 build/trans_style.java:4244
+#: build/trans_style.java:4202 build/trans_style.java:4209
+#: build/trans_style.java:4216 build/trans_style.java:4223
 msgid "address"
 msgstr "adresa"
@@ -27905,132 +28420,121 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Updating primitive"
+#~ msgstr "Aktualizácia pôvodných"
+
+#~ msgid "Expected closing parenthesis."
+#~ msgstr "Očakávam uzatváraciu zátvorku."
+
 #~ msgid ""
-#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ "Current number of changes exceeds the max. number of changes, current is "
+#~ "{0}, max is {1}"
 #~ msgstr ""
-#~ "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
-
-#~ msgid "Download all incomplete ways and nodes in relation"
-#~ msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii"
+#~ "Aktuálne množstvo zmien prekročilo maximálne množstvo zmien, aktuálne je "
+#~ "{0}, maximálne je {1}"
+
+#~ msgid "User with the same uid but different name found"
+#~ msgstr "Vytvorený užívateľ s rovnakým uid, ale rozdielnym menom"
+
+#~ msgid "Use an open changeset"
+#~ msgstr "Použiť a otvoriť zmenový súbor"
 
 #~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
+#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
 #~ msgstr ""
-#~ "Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie "
-#~ "jednej požiadavky na zmenené pôvodné"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Obrázky pre {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Čítať GPX..."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Žiadny čas pre bod {0} x {1}"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Nenájdené žiadne obrázky s časovými značkami."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Štart GPS: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Koniec GPS: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "súčastná odchylka: {0}s"
-
-#~ msgid "timezone difference: "
-#~ msgstr "rozdiel časových pásiem: "
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} vo vnútry stopy (track)."
-
-#~ msgid "Sync clock"
-#~ msgstr "Synchronizovať hodiny"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "V súbore \"{0}\" nie je časová značka EXIF"
+#~ "<html>Môžem použiť obrázok z môjho GPS prímača.<br>Môže toto pomôcť?</"
+#~ "html>"
+
+#~ msgid "All images"
+#~ msgstr "Všetky obrázky"
+
+#~ msgid "Images with no exif position"
+#~ msgstr "Obrázky bez exif pozície"
+
+#~ msgid "Not yet tagged images"
+#~ msgstr "Zatiaľ neoznačkované obrázky"
+
+#~ msgid "Found {0} matches of {1} in GPX track {2}"
+#~ msgstr "Najdené {0} zhody z {1} v GPX stope {2}"
+
+#~ msgid "GPX Track loaded"
+#~ msgstr "Nahratá GPX stopa(trasa)"
+
+#~ msgid "Offset between track and photos: {0}m {1}s"
+#~ msgstr "Vyrovnanie rozdielu medzi stopou(track) a fotkami: {0}m {1}s"
+
+#~ msgid "Default Values"
+#~ msgstr "Východzie hodnoty"
+
+#~ msgid "Enable proxy server"
+#~ msgstr "Používať proxy server"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonymný"
+
+#~ msgid "Proxy server host"
+#~ msgstr "Adresa proxy servera"
+
+#~ msgid "Proxy server port"
+#~ msgstr "Port proxy servera"
+
+#~ msgid "Proxy server username"
+#~ msgstr "Užívatelské meno pre proxy"
+
+#~ msgid "Proxy server password"
+#~ msgstr "Heslo pre proxy"
+
+#~ msgid "NullPointerException, possibly some missing tags."
+#~ msgstr "NullPointerException, pravdepodobne chýbajú niektoré značky (tagy)."
+
+#~ msgid "Preparing data..."
+#~ msgstr "Pripravujem dáta..."
+
+#~ msgid "Preparing..."
+#~ msgstr "Pripravujem..."
+
+#~ msgid "Uploading..."
+#~ msgstr "Nahrávam..."
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Nesprávne heslo alebo meno."
+
+#~ msgid "Enter Password"
+#~ msgstr "Zadajte heslo"
+
+#~ msgid "Login"
+#~ msgstr "Prihlásenie"
+
+#~ msgid "Error: failed to add authentication credentials to the connection."
+#~ msgstr "Chyba: neúspešné pridanie poverovacej autentifikácie pre spojenie."
+
+#~ msgid "Auto-tag source added:"
+#~ msgstr "Dodatočný zdroj automatických-značiek:"
+
+#~ msgid "Interpolation"
+#~ msgstr "Interpolácia (vloženie)"
+
+#~ msgid "Optional"
+#~ msgstr "Voliteľné"
+
+#~ msgid "Shop"
+#~ msgstr "Obchod"
+
+#~ msgid "aqueduct"
+#~ msgstr "akvadukt"
+
+#~ msgid "Move"
+#~ msgstr "Presunúť"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Vyriešiť konflikty"
 
 #~ msgid "Image"
 #~ msgstr "Obrázok"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)"
-
-#~ msgid "Synchronize Time with GPS Unit"
-#~ msgstr "Synchronizovať čas s GPS zariadením"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Zadaný čas nemôže byť rozparsovaný"
-
-#~ msgid ""
-#~ "WARNING: no API version defined for data to upload. Falling back to "
-#~ "version 0.6"
-#~ msgstr ""
-#~ "VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do "
-#~ "verzie 0.6"
-
-#~ msgid ""
-#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
-#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
-#~ "upload."
-#~ msgstr ""
-#~ "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
-#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať."
-#~ "Ignorujem rozdielne nahrávanie."
-
-#~ msgid ""
-#~ "Loading of {0} plugin was requested. This plugin is no longer required."
-#~ msgstr ""
-#~ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej "
-#~ "potrebný."
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - obrázky s geoznačkami"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Otvoriť obrázky s AgPifoJ..."
-
-#~ msgid "osmarender options"
-#~ msgstr "možnosti pre osmarender"
-
-#~ msgid "Group common Address Interpolation inputs in a single dialog,"
-#~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu."
-
-#~ msgid ""
-#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
-#~ "import EXIF geotagged pictures."
-#~ msgstr ""
-#~ "Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS "
-#~ "stopami, alebo import EXIF geotagged(GPS poloha) obrázkov."
-
-#~ msgid ""
-#~ "Several utilities that make your life easier: e.g. simplify way, join "
-#~ "areas, jump to position."
-#~ msgstr ""
-#~ "Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. "
-#~ "zjednodušenie cesty, spojiť plochy, skok na pozíciu."
-
-#~ msgid "Move"
-#~ msgstr "Presunúť"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Vyriešiť konflikty"
 
 #~ msgid "my version:"
@@ -28115,4 +28619,7 @@
 #~ msgstr "Vznikli konflikty počas importu"
 
+#~ msgid "Download all incomplete ways and nodes in relation"
+#~ msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii"
+
 #~ msgid "Date"
 #~ msgstr "Dátum"
@@ -28178,4 +28685,43 @@
 #~ msgstr "meno"
 
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Nedá sa prečítať čas \"{0}\" z bodu {1} x {2}"
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "Štart GPS: {0}"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Žiadny čas pre bod {0} x {1}"
+
+#~ msgid "Images for {0}"
+#~ msgstr "Obrázky pre {0}"
+
+#~ msgid "Read GPX..."
+#~ msgstr "Čítať GPX..."
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "súčastná odchylka: {0}s"
+
+#~ msgid "timezone difference: "
+#~ msgstr "rozdiel časových pásiem: "
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Zadajte dátum v tvare (mm/dd/rrrr HH:MM:SS)"
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} vo vnútry stopy (track)."
+
+#~ msgid "Sync clock"
+#~ msgstr "Synchronizovať hodiny"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Dáta v súbore \"{0}\" nemohli byť parsované."
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "Koniec GPS: {0}"
+
+#~ msgid "Time entered could not be parsed."
+#~ msgstr "Zadaný čas nemôže byť rozparsovaný"
+
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Prihlasovacie meno (email) k OSM účtu."
@@ -28211,4 +28757,7 @@
 #~ msgstr "finálna verzia:"
 
+#~ msgid "osmarender options"
+#~ msgstr "možnosti pre osmarender"
+
 #~ msgid "Import TCX file as GPS track"
 #~ msgstr "Importovať TCX súbor ako GPS trasu"
@@ -28258,4 +28807,7 @@
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Naozaj označiť tento problém ako \"hotový\"?"
+
+#~ msgid "Open images with AgPifoJ..."
+#~ msgstr "Otvoriť obrázky s AgPifoJ..."
 
 #~ msgid "Please enter a search string"
@@ -28354,4 +28906,13 @@
 #~ msgid "Split way segment"
 #~ msgstr "Rozdeliť segment cesty"
+
+#~ msgid "Synchronize Time with GPS Unit"
+#~ msgstr "Synchronizovať čas s GPS zariadením"
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "Časová zóna GPS zariadenia (rozdiel od fotografie)"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Nenájdené žiadne obrázky s časovými značkami."
 
 #~ msgid "Add either site-josm.xml or Wiki Pages."
@@ -28426,4 +28987,7 @@
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
 #~ msgstr "Nastaviť ručne Lambert zone (e.g. for locations between two zones)"
+
+#~ msgid "AgPifoJ - Geotagged pictures"
+#~ msgstr "AgPifoJ - obrázky s geoznačkami"
 
 #~ msgid "Selected makes your trace public in openstreetmap.org"
@@ -28494,4 +29058,7 @@
 #~ "stiahnuť."
 
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "V súbore \"{0}\" nie je časová značka EXIF"
+
 #~ msgid "Portcullis"
 #~ msgstr "Mreže"
@@ -28651,4 +29218,11 @@
 
 #~ msgid ""
+#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
+#~ "import EXIF geotagged pictures."
+#~ msgstr ""
+#~ "Ďalší geotag(GPS poloha) plugin pre JOSM. Zľaďované obrázky s GPS "
+#~ "stopami, alebo import EXIF geotagged(GPS poloha) obrázkov."
+
+#~ msgid ""
 #~ "Tools to work with authors/users. Selects map data that belongs to "
 #~ "selected user, opens browser showing selected author profile page."
@@ -28684,7 +29258,4 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr "Tip: Pri nahrávaní nových údajov zo servera nastali nejaké zmeny."
-
-#~ msgid "File could not be found."
-#~ msgstr "Súbor nie je možné nájsť."
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -28807,7 +29378,4 @@
 #~ msgid "Select a starting node on the end of a way"
 #~ msgstr "Vybrať a spustiť body na konci cesty"
-
-#~ msgid "Reached a junction"
-#~ msgstr "Je dosiahnuté spojenie"
 
 #~ msgid "parameter '{0}' must not be null"
@@ -29049,7 +29617,10 @@
 #~ msgstr "Neznáme rozšírenie súboru pre súbor ''{0}''"
 
-#~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
+#~ msgid ""
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
 #~ msgstr ""
-#~ "Upozornenie: neúspešné umiestnenie dialóg vždy navrchu. Výnimka bola: {0}"
+#~ "Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie "
+#~ "jednej požiadavky na zmenené pôvodné"
 
 #~ msgid "Can't search because there is no loaded data."
@@ -29114,4 +29685,10 @@
 #~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového "
 #~ "limitu servera. Výnimka bola: {1}"
+
+#~ msgid ""
+#~ "Loading of {0} plugin was requested. This plugin is no longer required."
+#~ msgstr ""
+#~ "Načítanie z {0} pluginov bolo požadované. Tento plugin nie je ďalej "
+#~ "potrebný."
 
 #~ msgid ""
@@ -29241,4 +29818,11 @@
 #~ "API verzia je ''0.5''. Got {1}"
 
+#~ msgid ""
+#~ "WARNING: no API version defined for data to upload. Falling back to "
+#~ "version 0.6"
+#~ msgstr ""
+#~ "VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do "
+#~ "verzie 0.6"
+
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Prednastavená skupina ''{0}'' zo skupiny ''{1}''"
@@ -29273,4 +29857,9 @@
 #~ "or <A HREF=\"{1}\">váš jazyk</A>."
 
+#~ msgid ""
+#~ "Can't undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Nemôžem zrušiť príkaz \"{0}\", pretože vrstva \"{1}\" nie je vybraná."
+
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
 #~ msgstr "Nie je možné nájsť pôvodné s id {0} v tejto dátovej sade"
@@ -29321,4 +29910,13 @@
 
 #~ msgid ""
+#~ "WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to "
+#~ "use diff uploads, but API is not able to handle them. Ignoring diff "
+#~ "upload."
+#~ msgstr ""
+#~ "Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
+#~ "požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať."
+#~ "Ignorujem rozdielne nahrávanie."
+
+#~ msgid ""
 #~ "Warning: Failed to restore window geometry from key ''{0}''. Falling back "
 #~ "to default geometry. Details: {1}"
@@ -29326,4 +29924,11 @@
 #~ "Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
 #~ "východziu geometriu. Detaily: {1}"
+
+#~ msgid ""
+#~ "Several utilities that make your life easier: e.g. simplify way, join "
+#~ "areas, jump to position."
+#~ msgstr ""
+#~ "Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. "
+#~ "zjednodušenie cesty, spojiť plochy, skok na pozíciu."
 
 #~ msgid ""
@@ -29353,4 +29958,7 @@
 #~ msgstr "Nápoveda / o programe"
 
+#~ msgid "Group common Address Interpolation inputs in a single dialog,"
+#~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu."
+
 #~ msgid "Set manually the Lambert zone"
 #~ msgstr "Manuálne nastaviť Lambert zone"
