Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 21299)
+++ applications/editors/josm/i18n/po/ar.po	(revision 21304)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-25 00:18+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 11:03+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,9 +17,9 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -32,12 +32,12 @@
 msgstr "المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "تجاهل URL ملف غيرصحيح التكوين: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -97,9 +97,9 @@
 msgstr "التحذير"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -226,5 +226,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -264,5 +264,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -276,4 +276,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -329,4 +330,13 @@
 msgstr "أضف عقدة بواسطة خط الطول و خط العرض."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -340,8 +350,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -397,5 +407,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -451,5 +461,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -460,7 +470,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -478,7 +489,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -546,28 +557,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "لا يوجد شيء محدد للتكبير/للتصغير."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "زوم الى {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "كبّر/صغّر الرؤية إلى {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "أعرض: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "لا  تناقضات للتكبير عليها"
@@ -656,5 +667,5 @@
 msgstr "ادمج {0} طرقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "الرجاء إختر على الأقل طريقتين للدمج."
@@ -702,5 +713,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -811,5 +822,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr ""
@@ -854,5 +865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -981,25 +992,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "تمت إضافة العقدة على كل التقطعات"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "صلّح العلاقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1007,33 +1018,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "ادخل القيم لكل التناقضات."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "حلل التناقضات"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "صلّح تضاربات التسمية"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "تم حذف العنصر من العلاقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr ""
@@ -1052,5 +1063,5 @@
 msgstr "ضمّ العقدة و الخط"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "لا إختصار"
@@ -1490,8 +1501,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1501,5 +1512,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1899,20 +1910,27 @@
 msgstr "إلغاء التصرف الأخير."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "إلغاء إختيار الكلّ"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "إلغاء إختيار كلّ الأغراض."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr ""
@@ -2031,16 +2049,12 @@
 msgstr "أقلب عرض الأسلاك"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "كبّر الرؤية"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "صغّر الرؤية"
@@ -2250,9 +2264,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2267,52 +2281,52 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "أرسم"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "أرسم عقد"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "أضافة عقدة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "إضافة عقدة إلى طريق"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
+msgid "Connect existing way to node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
-msgid "Connect existing way to node"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "إضافة عقدة جديدة إلى طريق موجودة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "انشئ عقدة جديدة"
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "إختر العقدة الموجودة تحت المزلاق."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2321,14 +2335,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "إبدء طريق جديدة من العقدة الأخيرة."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "تابع طريق من العقدة الأخيرة."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "إنهي الرسم."
@@ -2845,5 +2859,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3720,5 +3734,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "مُنتقى"
@@ -3749,5 +3763,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "الخلفية"
@@ -3831,9 +3845,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3931,6 +3945,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4052,38 +4066,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "حمّل التفضيلات"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "حمّل التفضيلات الحالية إلى الخادم"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "سلسلة النص"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "إسم المستخدم."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "كلمة المرور أو.أس.أم."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "غيّر قياس البريمج إلى الهندسة المحددة (تصميم عرضxطول)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "السلسلة؛السلسلة؛..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4091,5 +4105,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4097,5 +4111,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4103,87 +4117,87 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "أيّ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "كلمة‌المرور"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "الإستعمال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "الخيارات"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "أعرض هذه المساعدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4193,9 +4207,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "أمثال"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4203,37 +4217,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "جاري التهيئة"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "جاري إنشاء واجهة المستخدم الرسومية الرئيسية"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4246,5 +4260,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4368,10 +4382,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "الطبقة ليست في اللائحة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4784,5 +4798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5270,6 +5284,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5284,5 +5298,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5558,5 +5572,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5631,5 +5645,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "أعد التحميل"
@@ -5685,9 +5699,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
@@ -6813,8 +6827,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7432,55 +7446,55 @@
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8106,5 +8120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8136,21 +8150,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8172,5 +8186,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8184,5 +8198,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8218,14 +8232,14 @@
 msgstr "أرقام البلاطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8239,5 +8253,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8525,5 +8539,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9259,7 +9273,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9416,4 +9433,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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"
@@ -9582,5 +9600,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9642,18 +9660,18 @@
 msgstr "طبقة المعطيات {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "خارج عن المنطقة المنزلة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9662,5 +9680,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9674,5 +9692,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9685,11 +9703,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9698,32 +9716,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} يتألف من:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9777,8 +9795,4 @@
 msgstr[5] "{0} نقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10053,5 +10067,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
@@ -10076,5 +10090,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10106,55 +10120,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10163,5 +10177,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10230,7 +10244,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "أعرض/أخفي النص/الأيقونات"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11038,35 +11051,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "اللون"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "نوع   الطلاء   {0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "إختر"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "الرجاء إختيار اللون لِــ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "الألوان المستعملة في الأغراض المختلفة في ج.أو.أس.أم."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "الألوان"
@@ -11510,17 +11523,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "مُعَطَّل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">إختصارات لوحة المفاتيح</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11528,5 +11541,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11537,5 +11550,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11552,9 +11565,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11565,5 +11578,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11572,66 +11585,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "إقراء أولاً"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "إستعمل الغيابي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "عَطّل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "المفتاح:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "إنتباه: إستعمل فقط مفاتيح اللوحة الحقيقية !"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "إختصارات لوحة المفاتيح"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "حرّر الإختصارات"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "المغيير الأولي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "المغير الثانوي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "المغيير الثلاثي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr ""
@@ -11693,21 +11706,21 @@
 "يجب عليك إعادة بدء تشغيل ج.أو.أس.أم كي تُأخذ بعض التغييرات بعين الإعتبار."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "أعرض الإحداثيات كــ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "منهج الإسقاط"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "إسقاط الخريطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11752,10 +11765,9 @@
 msgstr "تغيير إختصارات لوحة المفاتيح يدوياً"
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "الفعل"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "الإختصار"
@@ -12229,24 +12241,23 @@
 msgstr "نوع غير معروف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "خطأ في التحليل النحوي  {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "العناصر من الفصيلة {0} هي مدعومة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12260,17 +12271,17 @@
 msgstr[5] "غيّر {0} غرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "الخيار فارغ !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "الخيار غير مناسب !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "طبّق الخيار المسبق"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "غيّر الخصائص"
@@ -12779,11 +12790,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14055,5 +14059,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14063,5 +14067,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14071,5 +14075,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14080,5 +14084,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(تلميحة: يمكنك تحرير المختصرات في التفضيلات)"
@@ -14448,15 +14452,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14475,18 +14479,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14653,7 +14657,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "إنتقاء الطبقة الهدف."
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15177,7 +15180,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "بيت ضيافة"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15213,7 +15215,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "الخيارات"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16673,32 +16674,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "إسترجع"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "خط الغرض الزمني"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "الخط الزمني للعنصر"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "حضّر المعطيات أو.أس.أم ..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "أغلق حزمات التغييرات المفتوحة"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "خطأ : {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "اعداد..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "آخر تغيير في {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -16934,5 +16936,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17009,16 +17010,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -17864,12 +17865,10 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "إلغاء إختيار كلّ الأغراض."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "إلغاء إختيار كلّ الأغراض."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
@@ -17878,17 +17877,14 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "إسم الغرض عند مؤشر الفأرة."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "إلغاء إختيار كلّ الأغراض."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "إلغاء إختيار كلّ الأغراض."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
@@ -17897,22 +17893,21 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "أغلق الحوار و الغي التنزيل"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "الملف : {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "الصول لِــ {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "وجدتُ {0} مطابقات"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18656,4 +18651,14 @@
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "مرئيّات"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19062,4 +19067,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "إلى أسفل"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19245,7 +19256,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "أغلق حزمات التغييرات المفتوحة"
+msgstr ""
 
 #. Plugin routes
@@ -19317,6 +19327,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19325,15 +19343,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19342,5 +19360,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -31895,7 +31913,4 @@
 #~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
 
-#~ msgid "Preparing..."
-#~ msgstr "اعداد..."
-
 #~ msgid "Login"
 #~ msgstr "دخول"
@@ -31954,7 +31969,4 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة"
-
-#~ msgid "Revert"
-#~ msgstr "إسترجع"
 
 #~ msgid "Error parsing server response."
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 21299)
+++ applications/editors/josm/i18n/po/bg.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-24 23:36+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-15 21:24+0000\n"
+"Last-Translator: pl71 <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:53+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Помощ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнориране неправилен адрес на файл: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,10 +96,10 @@
 msgstr "Внимание"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Параметърът \"downloadgps\" не възприема имена на файлове или файлови URL."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -231,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -248,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -269,5 +269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -281,4 +281,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -336,4 +337,13 @@
 msgstr "Добавяне на точка чрез въвеждане на нейната широчина и дължина."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -347,8 +357,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -404,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -458,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -467,7 +477,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -485,7 +496,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -553,28 +564,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Няма нищо избрано за показване."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Показване на {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Промяна на мащаба за да може да се види {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Изглед: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Няма конфликти за показване."
@@ -667,5 +678,5 @@
 msgstr "Обединяване {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Моля, изберете поне две линии за комбиниране."
@@ -713,5 +724,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -823,5 +834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr ""
@@ -867,5 +878,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -994,25 +1005,25 @@
 msgstr "Няма намерено пресичане. Няма направени промени."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Добавен възел на всички кръстовища"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Изтриване Пътища, които не са част от вътрешен мултиполигон"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Поправяне на релации"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Свързана само-пресичаща се област"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Свързана пресичаща област"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1022,33 +1033,33 @@
 "проверете дали няма да се появят грешки."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Въведете стойности за всички конфликти."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Разрешаване на конфликти"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Поправяне конфликти маркери"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Премахнати елементи от връзки"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Присъедини области: премахване на кратки пътища"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Затворен Път"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Премахване на маркери от вътрешни пътища"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Функция свързване на области"
@@ -1067,5 +1078,5 @@
 msgstr "Свързване на точка с линия"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Няма бърза клавишна комбинация"
@@ -1509,8 +1520,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1520,5 +1531,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1939,20 +1950,27 @@
 msgstr "Отменяне на последното действие."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Размаркиране всичко"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Сваля избора от всички обекти."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Размаркиране всичко (focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Размаркиране всичко (escape)"
@@ -2071,16 +2089,12 @@
 msgstr "Превключване режим каркас"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Увеличаване"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Намаляване"
@@ -2291,9 +2305,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2311,52 +2325,52 @@
 "обекти, към които има обръщение."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Рисуване"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Рисуване на точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Режим: Рисуване Фокус"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Не може да се добави точка извън пределите на света."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Добавяне на точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Добавяне на точка в път"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Свързване на съществуващ път към точка"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Добавяне на нова точка към съществуващ път"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Добавяне на точка към път и съединяване"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Създаване нов възел."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Избиране на точката под курсора."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2365,14 +2379,14 @@
 msgstr[1] "Вмъкване на нов възел в {0} пътя."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Започване на нов път от последния възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Продължаване на път от последния възел."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Завършване на чертането."
@@ -2912,5 +2926,5 @@
 msgstr "Добавяне на отношение {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3797,5 +3811,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "избран"
@@ -3826,5 +3840,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "фон"
@@ -3908,9 +3922,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4010,6 +4024,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4127,38 +4141,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Параметри при качване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Качете текущите параметри на сървъра"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "низ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Потребителско име"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Променете размера на аплета до зададения (формат: ШИРОЧИНА x ВИСОЧИНА)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "низ;низ;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4168,5 +4182,5 @@
 "lat=y&lon=x&zoom=z, или име на файл."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4176,5 +4190,5 @@
 "съдържаща lat=y&lon=x&zoom=z или име на файл"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4184,87 +4198,87 @@
 "URL препратка, връщаща osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "всеки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Ако е указано, да се нулира конфигурацията вместо да се прочете."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Потребителско име"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Парола"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "използване"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Показване на тази помощ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Стандартен параметри на unix геометрия"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Сваляне на област в предала на рамка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Сваляне на област по препратка (с параметри lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Сваляне на област от рамка, като GPS данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Избор с даденото търсене"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Стартиране в максимизиран режим"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Възстановяване на параметрите по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/път/към/папката/на/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4274,9 +4288,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "примери"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4284,37 +4298,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Инициализиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Зареждане на ранните разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Настройки по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Създаване на интерфейса"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Зареждане на разширения"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4327,5 +4341,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4449,10 +4463,10 @@
 msgstr "Потребител:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "слоя не е в списъка."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4868,5 +4882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5357,6 +5371,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5367,5 +5381,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5641,5 +5655,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5714,5 +5728,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Презареди"
@@ -5768,9 +5782,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Преместване избрания слой един ред нагоре."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Преместване избрания слой един ред надолу."
@@ -6898,8 +6912,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7517,55 +7531,55 @@
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойства: {0} / Членство: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Параметри / Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Промяна на връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Изтриване от връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Изваждане на избраните обекти от релация {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Изтриване на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8197,5 +8211,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8227,21 +8241,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Грешка! Възможно е да липсват маркери (тагове)."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8263,5 +8277,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8275,5 +8289,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8309,14 +8323,14 @@
 msgstr "Номера квадранти"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8330,5 +8344,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8624,5 +8638,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Забелязани са конфликти"
@@ -9377,7 +9391,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Качване на {0} обект..."
+msgstr[1] "Качване на {0} обекта..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9534,4 +9551,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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 точка"
@@ -9700,5 +9718,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9766,18 +9784,18 @@
 msgstr "Слой Данни {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "извън областта за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9786,5 +9804,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9798,5 +9816,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9809,11 +9827,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9822,32 +9840,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} се състои от:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "неустановена"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Преобразувай в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9893,8 +9911,4 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10178,5 +10192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Изображения с данни за местоположение"
@@ -10201,5 +10215,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10231,55 +10245,55 @@
 msgstr "Грешка във файла {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Предишен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Премахване на снимка от слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Следващ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Центриране на изгледа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Показване на най-доброто оразмеряване и 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10290,5 +10304,5 @@
 "Височина: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10360,7 +10374,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Показване/скирване на Текст/Икони"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11189,35 +11202,35 @@
 msgstr "Калибровка на звукозаписа"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Стил на изобразяване {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Изберете"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Изберете цвят за {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Задай по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Задай всички да са по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Цветове, използвани от различни обекти в JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Цветове"
@@ -11675,17 +11688,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "изключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "без модификатор"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Бързи клавиши</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11693,5 +11706,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11702,5 +11715,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11717,9 +11730,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Групи модификатори</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11730,5 +11743,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11739,66 +11752,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Прочетане първо"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Използване на стойностите по подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Изключване"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Ключ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Внимание: Използвайте само присъстващи на клавиатурата ви клавиши!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Бързи клавиши"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Редактиране на бързите клавиши"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Основен модификатор:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Втори модификатор:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Трети модификатор:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Бързи клавишни комбинации за менюто"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Горещи клавишни комбинации"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Бързи клавиши за подменюта"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Група модификатори"
@@ -11860,21 +11873,21 @@
 "Трябва да рестартирате JOSM, за да може изменените настройки да подействат."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Показвай координатите като"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Метод на проекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Картографска проекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11920,10 +11933,9 @@
 msgstr "Промяна клавишни комбинации ръчно."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Действие"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Бърз клавиш"
@@ -12397,24 +12409,23 @@
 msgstr "Неизвестен тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Грешка при разбор {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи от тип {0} се поддържат."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12424,17 +12435,17 @@
 msgstr[1] "Промяна {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Нищо не е избрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Селекцията е неподходяща!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Прилагане шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Промяна параметри"
@@ -12945,11 +12956,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Качване на {0} обект..."
-msgstr[1] "Качване на {0} обекта..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14233,5 +14237,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14245,5 +14249,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14253,5 +14257,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14262,5 +14266,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -14633,15 +14637,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14660,18 +14664,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14838,7 +14842,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Изберете WMS слой"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15377,7 +15380,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Къща за гости"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15413,7 +15415,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Незадължително"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15442,7 +15443,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Измервания"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16917,32 +16917,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Възстановяване"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "История на обекта"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Точка от историята"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Подготвяне на данните..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Затваряне на списъците с промени"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "изискани: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Релация ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Списък с промени {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17179,5 +17180,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17254,11 +17254,11 @@
 msgstr "неочакван номер на колона {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Тестер на шаблони за маркиране"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -17267,5 +17267,5 @@
 "диалозите с шаблони."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -18113,12 +18113,10 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Сваля избора от всички обекти."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Изтриване на {0} обект"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
@@ -18127,42 +18125,37 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Въведете URL откъдето да се свалят данните"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Изтриване на {0} обект"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Изтриване на {0} обект"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Начало на подравняването"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Затвори и прекрати свалянето"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Файл: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Зареждане {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Възел {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18927,4 +18920,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Видео"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19345,4 +19348,10 @@
 msgstr "Трябва да направите редакциите си публични за да качвате нови данни"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "надолу"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19551,7 +19560,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Затваряне на сисъка с промени."
+msgstr ""
 
 #. Plugin routes
@@ -19632,6 +19640,14 @@
 "имената на маркерите."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19640,15 +19656,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19657,5 +19673,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21841,10 +21857,10 @@
 #: build/trans_presets.java:855
 msgid "Lift Gate"
-msgstr "Вдигаще се врата"
+msgstr "Бариера"
 
 #. item "Barriers/Lift Gate"
 #: build/trans_presets.java:856
 msgid "Edit Lift Gate"
-msgstr "Редактиране на вдигаща се преграда"
+msgstr "Редактиране на \"бариера\""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
@@ -32278,7 +32294,4 @@
 #~ msgstr "Невъзможно да се установи връзка със сървъра."
 
-#~ msgid "Revert"
-#~ msgstr "Възстановяване"
-
 #~ msgid "Authors: {0}"
 #~ msgstr "Автори: {0}"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 21299)
+++ applications/editors/josm/i18n/po/cs.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-30 19:58+0000\n"
-"Last-Translator: Jezevec <Unknown>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 10:29+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:51+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoruji poškozený soubor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "Varování"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametr \"downloadgps\" neakceptuje jména souborů nebo URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -232,5 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -282,4 +282,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -337,4 +338,13 @@
 msgstr "Přidat uzel zadáním zeměpisné šířky a délky."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -348,8 +358,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -405,5 +415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -459,5 +469,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -468,7 +478,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -486,7 +497,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -554,28 +565,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Není zvoleno nic co by se dalo přiblížit"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zvětšit na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zvětšit pohled na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Zobrazení: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Není žádný konflikt, na který by se mohlo přiblížit"
@@ -666,5 +677,5 @@
 msgstr "Kombinovat {0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
@@ -713,5 +724,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -822,5 +833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Stáhnout objekt"
@@ -865,5 +876,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -993,25 +1004,25 @@
 msgstr "Nenalezen žádný průnik. Nic se nemění."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Přidány body na všechny průsečíky"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Smazat cesty, které nejsou součástí vnižního multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Opravit relace."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Spojena plocha překrývající sama sebe"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Spojeny překrývající se plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1021,33 +1032,33 @@
 "tímto nedošlo ke vzniku chyb."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Zadej hodnoty pro všechny konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Vyřešit konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Opravit konflikty značek"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Prvek odstraněn z relací"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Spojit plochy: Vymazat krátké cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Uzavřená cesta"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Odstranit tagy z vnitřních cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Funkce spojení ploch"
@@ -1066,5 +1077,5 @@
 msgstr "Spojit uzly a linie"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Beze zkratky"
@@ -1513,8 +1524,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1524,5 +1535,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1945,20 +1956,27 @@
 msgstr "Vrátit poslední akci."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Odznačit vše"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Odznačit všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Odznačit vše (Fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Odznačit vše (Escape)"
@@ -2077,16 +2095,12 @@
 msgstr "Přepnout drátový model"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Přiblížit"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Oddálit"
@@ -2306,9 +2320,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2325,52 +2339,52 @@
 "když mažete trasu. CTRL: smazat referenční objekty."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Kreslit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Kreslit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Nemůžu přidat uzel ležící mimo Zemi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Přidat uzel"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Přidat uzel do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Spojit existující cestu do uzlu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Přidat nový uzel do již existující cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Přidat uzel do cesty a spojit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Vytvořit nový uzel."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Vybrat uzel pod kurzorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2380,14 +2394,14 @@
 msgstr[2] "Vložit nový uzel do {0} cest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Začít novou cestu od posledního uzlu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Pokračovat v cestě od posledního uzlu."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Dokončit kreslení"
@@ -2929,5 +2943,5 @@
 msgstr "Přidat relaci {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3817,5 +3831,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "vybráno"
@@ -3846,5 +3860,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "pozadí"
@@ -3928,9 +3942,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4028,6 +4042,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4147,38 +4161,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Nahrát nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Nahrát současné nastavení na server"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "řetězec"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Jméno uživatele."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Heslo OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Změnit velkost appletu (formát: ŠÍŘKAxVÝŠKA)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "řetězec;řetězec;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4188,5 +4202,5 @@
 "nebo název souboru."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4196,5 +4210,5 @@
 "at=y&lon=x&zoom=z nebo název souboru."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4204,87 +4218,87 @@
 "jako na Googlu nebo URL vracející osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "cokoliv"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Pokud je nastaveno, smaže se konfigurace, místo jejího načtení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Jméno uživatele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "použití"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Zobrazí tuto nápovědu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standardní unixová geometrie okna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Stáhnout ohraničující box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Stáhnout umístění s url (obsahující lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Stáhnout ohraničenou oblast jako \"raw\" GPS data"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Spustit přes celou obrazovku"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Nastavit výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/ADRESARI/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Změnit adresář pro všechna uživatelská nastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4294,9 +4308,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "příklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4304,37 +4318,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicializace"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Instaluji aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Načítám dřívější pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Nastavuji výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Vytváří se grafické rozhraní programu (GUI)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Načítám pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4347,5 +4361,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4469,10 +4483,10 @@
 msgstr "Uživatel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "vrstva není v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4899,5 +4913,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5399,6 +5413,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5410,5 +5424,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5695,5 +5709,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5768,5 +5782,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Znovu načíst"
@@ -5822,9 +5836,9 @@
 msgstr "Duplikovat tuto vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
@@ -6957,8 +6971,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7583,55 +7597,55 @@
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8279,5 +8293,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Hranice"
@@ -8309,21 +8323,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Výjimka desetinné čárky, pravděpodobně nějaké chybějící tagy."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Hledat ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Klikněte pro zahájení hledání míst"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Dotazuji se jmeného serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Dotazuji se jmeného serveru ..."
@@ -8345,5 +8359,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8357,5 +8371,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8391,14 +8405,14 @@
 msgstr "Čísla dlaždic"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "Nepodařilo se načíst CSS soubor ''help-browser.css''. Výjimka je: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM prohlížeč nápovědy"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8418,5 +8432,5 @@
 "a> a v <a href=\"{3}\">angličtině</a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8716,5 +8730,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Objeveny konflikty"
@@ -9491,7 +9505,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Nahrávám {0} objektů ..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Nahrávám {0} objekt..."
+msgstr[1] "Nahrávám {0} objekty..."
+msgstr[2] "Nahrávám {0} objektů..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9652,4 +9670,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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 bod"
@@ -9820,5 +9839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9884,18 +9903,18 @@
 msgstr "Datová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "mimo stažený areál"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Varování: míchání dat z verze 0.6 a 0.5 má za výsledek data verze 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9905,5 +9924,5 @@
 msgstr[2] "Bylo nalezeno {0} konfliktů."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9924,5 +9943,5 @@
 "objektů<br>z lokální datové sady protože byly vymazány na serveru."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9942,11 +9961,11 @@
 "vyřešte je manuálně."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Klikněte pro uzavření tohoto dialogu a návrat k editaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9956,32 +9975,32 @@
 msgstr[2] "{0} smazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skládá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "nenastaveno"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Verze API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Převédst do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Test konzistence dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "Nenalezen žádný problém"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -10031,8 +10050,4 @@
 msgstr[2] "{0} bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10316,5 +10331,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
@@ -10339,5 +10354,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10369,55 +10384,55 @@
 msgstr "Chyba v souboru {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Předchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Odebrat fotografii z vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Další"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centrovat pohled"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10428,5 +10443,5 @@
 "Výška: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10496,7 +10511,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Zobrazit/Skrýt Text/Ikony"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11325,35 +11339,35 @@
 msgstr "Kalibrace nahrávání zvuku"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Barva"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Styl kreslení {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Vybrat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Zvolte barvu pro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Nastavit na výchozí hodnotu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Nastavit vše na výchozí hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Barvy použité různými objekty v JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Barvy"
@@ -11806,17 +11820,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "zakázáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "žádný přepínač"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Klávesové zkratky</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11827,5 +11841,5 @@
 "projevily.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11840,5 +11854,5 @@
 "provedených v klávesových zkratkách.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11855,9 +11869,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Skupiny modifikátorů</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11868,5 +11882,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11875,66 +11889,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Nejdřív čti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Použít výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Zakázat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Klávesa:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Upozornění: Používejte pouze skutečné klávesy!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Upravit zkratky"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Primární modifikátor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Druhý modifikátor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Třetí modifikátor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menu zkatky"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Klávesové zkratky"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Skupiny modifikátorů"
@@ -11995,21 +12009,21 @@
 msgstr "Některá nastavení se projeví až po restartování JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Zobrazovat souřadnice jako"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Metoda projekce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Kód projekce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Projekce mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12054,10 +12068,9 @@
 msgstr "Umožní nastavit klávesové zkratky ručně."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Akce"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Klávesová zkratka"
@@ -12554,24 +12567,23 @@
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekty typu {0} nejsou podporovány."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12582,17 +12594,17 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Změnit vlastnosti"
@@ -13109,12 +13121,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Nahrávám {0} objekt..."
-msgstr[1] "Nahrávám {0} objekty..."
-msgstr[2] "Nahrávám {0} objektů..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13446,7 +13450,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "Chybějící povinný atribut ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -13579,7 +13582,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(na řádce {0}, sloupci {1})"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -14437,5 +14440,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14448,5 +14451,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14456,5 +14459,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14465,5 +14468,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: Klávesové zkratky lze změnit v nastavení.)"
@@ -14833,15 +14836,15 @@
 msgstr "Čísla:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14860,18 +14863,18 @@
 msgstr "Délka kroku:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -15046,7 +15049,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Vybrat WMS vrstvu"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15582,7 +15584,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Penzion"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15618,7 +15619,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Volitelné"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15647,7 +15647,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Sestupně"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -17118,32 +17117,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Vrátit zpět"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Historie objektu"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Položka historie"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Parsuji data historie OSM ..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Dotaz na sady změn"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "požadováno: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relace..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Zobrazit sadu změn {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17382,5 +17382,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17458,16 +17457,16 @@
 msgstr "neočekávané číslo sloupce {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tester předvoleb značení"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr "Otevřít nástroj pro testovaní dialogů přednastavených značek."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "Je třeba zadat zdroje předvoleb v konfiguraci."
@@ -18328,57 +18327,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Smazat objekty"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Smazat objekty"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Zvolte, pokud mají být data stažena do nové vrstvy"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Zadat ID objektu, který chcete stáhnout"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Smazat objekty"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Smazat objekty"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Začít upravování"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Zavřít dialog a ukončit stahování"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Soubor: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Nahrávám {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Bod {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19134,4 +19125,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Videopůjčovna/prodejna"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19554,4 +19555,10 @@
 msgstr "Musíte vaše editace označit jako veřejné pro nahrávání nových dat"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "dolů"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19760,7 +19767,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Otevře dialog pro sady změn"
+msgstr ""
 
 #. Plugin routes
@@ -19838,6 +19844,14 @@
 "provádí opravy. Zahrnuje kontrolu překlepů pro tagy."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19848,15 +19862,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Snadné stahovaní velmi dlouhých propojených cest"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19865,5 +19879,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32326,4 +32340,7 @@
 msgstr "Sicily - Itálie"
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Nahrávám {0} objektů ..."
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -32379,7 +32396,4 @@
 #~ msgid "my version:"
 #~ msgstr "moje verze:"
-
-#~ msgid "Revert"
-#~ msgstr "Vrátit zpět"
 
 #~ msgid "Unsaved Changes"
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 21299)
+++ applications/editors/josm/i18n/po/da.po	(revision 21304)
@@ -9,6 +9,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-24 22:28+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 09:52+0000\n"
 "Last-Translator: Søren <shkristensen@gmail.com>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
@@ -17,9 +17,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:52+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:30+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -32,12 +32,12 @@
 msgstr "Hjælp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorerer misformet fil-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -97,9 +97,9 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" accepterer ikke filnavne eller fil-URL'er"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -232,5 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -282,4 +282,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -337,4 +338,13 @@
 msgstr "Tilføj punkt ved at indtaste breddegrad og længdegrad"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -348,8 +358,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -405,5 +415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -459,5 +469,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -468,7 +478,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -486,7 +497,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -554,28 +565,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Intet markeret at zoome ind på."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom til {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom synsfeltet til {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Vis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter at zoome ind på."
@@ -667,5 +678,5 @@
 msgstr "Kombiner {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Vælg mindst to veje at kombinere."
@@ -715,5 +726,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -824,5 +835,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Download objekt"
@@ -867,5 +878,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -994,25 +1005,25 @@
 msgstr "Intet skæringspunkt fundet. Intet blev ændret."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Tilføjede punkter ved alle skæringspunkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Slet veje, som ikke er dele af en indre multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Ret relationer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Forbandt selv-overlappende område"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Forbandt overlappende områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1022,33 +1033,33 @@
 "venligst at ingen nye fejl er blevet introduceret."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Indtast værdier for alle konflikter."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Løs konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Løs tag konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Fjernede element fra relationer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Sammenlæg områder: Fjern korte veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Lukket vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Fjern tags fra indre veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Funktion til sammenlægning af områder"
@@ -1067,5 +1078,5 @@
 msgstr "Forbind punkt og linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Ingen genvej"
@@ -1516,8 +1527,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1527,5 +1538,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1940,20 +1951,27 @@
 msgstr "Fortryd den sidste handling"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Fravælg alt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Fravælg alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Fravælg alt (fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Fravælg alt (Escape)"
@@ -2073,16 +2091,12 @@
 msgstr "Slå trådnet-visning til/fra"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Zoom ind"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zoom ud"
@@ -2301,9 +2315,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2320,52 +2334,52 @@
 "når en vej slettes. Ctrl: Slet refererende objekter."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Tegn"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Tegn punkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Tilstand: Tegn fokus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Kan ikke tilføje et punkt uden for verdenen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Tilføj punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Tilføj punkt inde i vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Forbind eksisterende vej til punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Tilføj et nyt punkt til en eksisterende vej"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Tilføj punkt ind i vej og forbind"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Opret nyt punkt."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Vælg punkt under markøren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2374,14 +2388,14 @@
 msgstr[1] "Indsæt nyt punkt i {0} veje."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Start ny vej fra seneste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Fortsæt vej fra seneste punkt."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Afslut tegning."
@@ -2944,5 +2958,5 @@
 msgstr "Tilføj relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3857,5 +3871,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "valgt"
@@ -3886,5 +3900,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "baggrund"
@@ -3970,9 +3984,9 @@
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4070,6 +4084,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4187,39 +4201,39 @@
 msgstr "Forventede ikke-tom værdi for parameter \"{0}\". Fik \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Upload indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Upload de nuværende indstillinger til serveren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "tekststreng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Brugerens navn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM-adgangskode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 "Ret størrelsen af programmet til den angivne geometri (format: BREDDExHØJDE)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "tekststreng;tekststreng;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4229,5 +4243,5 @@
 "eller et filnavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4237,5 +4251,5 @@
 "lat=y&lon=x&zoom=z eller et filnavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4245,87 +4259,87 @@
 "søgestreng eller en URL som returnerer OSM-XML"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "enhver"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Hvis angivet, nulstil konfigurationen i stedet for at indlæse den."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Brugernavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "brug"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "valgmuligheder"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Vis denne hjælp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometrisk argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Download afgrænsningsfeltet"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download stedet fra URL'en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Åbn en fil (enhver filtype der kan åbnes med Fil/Åbn)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Download afgrænsningsfeltet som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download stedet ved URL'en (med bredde=x&længde=y&zoom=z) som rå GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Vælg med den givne søgning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Start op i maksimeret tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Nulstil indstillingerne til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Indstil sproget"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "options givet som Java systemegenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/STI/TIL/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Ændr folderen for alle bruger indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4339,9 +4353,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4349,37 +4363,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Vær sikker på at du indlæser nogle data hvis du bruger --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialiserer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Opdaterer plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installerer opdaterede plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Henter indledende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Sætter standardværdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Opretter hovedgrænseflade"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Henter udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4392,5 +4406,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4516,10 +4530,10 @@
 msgstr "Bruger:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "lag er ikke i listen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4961,5 +4975,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5206,5 +5220,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5212,7 +5226,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>For at beholde din lokale version, er JOSM<br>nødt til at nulstille "
-"primitiv {0}'s ID til 0.<br>Ved næste upload vil serveren tildele<br>den en "
-"ny ID.<br>Indvilliger du?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5464,6 +5475,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5474,5 +5485,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5775,5 +5786,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5848,5 +5859,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Genindlæs"
@@ -5902,9 +5913,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Flyt det valgte lag en række op."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Flyt det valgte lag en række ned."
@@ -7042,8 +7053,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7690,55 +7701,55 @@
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaber: {0} / Medlemskaber: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Egenskaber / Medlemskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Skift relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Slet fra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Slet virkelig det markerede fra relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Ret værdien for den valgte nøgle for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Markér relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Vælg relation i hovedmarkering."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Markér i relationsliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Markér relation i relationsliste."
@@ -8404,5 +8415,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Afgrænsninger"
@@ -8434,21 +8445,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer-fejl, sikkert på grund af nogle manglende tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Søg ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Klik for at begynde søgning efter steder"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Forespørger på navneserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Forespørger på navneserver ..."
@@ -8470,5 +8481,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8482,5 +8493,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8516,14 +8527,14 @@
 msgstr "Tern-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "Kunne ikke læse CSS-filen ''help-browser.css''. Undtagelse er: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM's Hjælp-browser"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8537,5 +8548,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8841,5 +8852,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Konflikter opdaget"
@@ -9630,7 +9641,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Uploader {0} objekter ..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9800,4 +9814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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-punkt"
@@ -9972,5 +9987,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10039,18 +10054,18 @@
 msgstr "Datalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "Uden for det downloadede område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Advarsel: At blande 0.6 og 0.5 data resulterer i version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10059,5 +10074,5 @@
 msgstr[1] "Der blev opdaget {0} konflikter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10075,5 +10090,5 @@
 "{0} objekter<br>fra det lokale datasæt fordi de er slettet på serveren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10090,11 +10105,11 @@
 "konfliktlistedialogen og løs dem manuelt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Klik for at lukke denne dialog og fortsætte med at redigere"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10103,32 +10118,32 @@
 msgstr[1] "{0} slettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består af:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "nulstil"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API-version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Datasætskonsistenstest"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "Fandt ingen problemer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Følgende problemer blev fundet:"
@@ -10176,8 +10191,4 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10464,5 +10475,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggede billeder"
@@ -10487,5 +10498,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Slet billedfil fra disk"
@@ -10519,55 +10530,55 @@
 msgstr "Fejl i fil {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Vis geo-taggede billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Vis foregående billede"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Geobillede: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Fjern foto fra lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Slet fil fra disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Næste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Vis næste billede"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centrer synsfelt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Zoom best fit og 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "Flyt dialog til sidepanelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10578,5 +10589,5 @@
 "Højde: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10645,7 +10656,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Vis/skjul tekst/ikoner"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11518,35 +11528,35 @@
 msgstr "Kalibrering af lydoptagelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Tegnestil {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Vælg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Vælg en farve for {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Sæt til standardværdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Sæt alle til standardværdi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Farver brugt af forskellige objekter i JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Farver"
@@ -11998,17 +12008,17 @@
 msgstr "JOSM's udvidelsesmodulbeskrivelsesURL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "slået fra"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "ingen tilføjelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Tastatur-genveje</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12016,5 +12026,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12025,5 +12035,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12040,9 +12050,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12053,5 +12063,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12060,66 +12070,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Læs først"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Brug standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Slå fra"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Tast:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Bemærk: Brug kun rigtige tastaturtaster!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturgenveje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Ret genveje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menu-genveje"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr ""
@@ -12182,21 +12192,21 @@
 msgstr "Du skal genstarte JOSM for at nogle af ændringerne træder i kraft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Vis koordinater som"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projektionsmetode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Projektionskode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Kortprojektion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12243,10 +12253,9 @@
 msgstr "Ret tastaturgenveje manuelt"
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Handling"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Genvej"
@@ -12750,24 +12759,23 @@
 msgstr "Ukendt type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Kunne ikke læse kilde med fordefinerede tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fejl ved fortolkning af {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementer af typen {0} er understøttet."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12777,17 +12785,17 @@
 msgstr[1] "Ret {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Markering uegnet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Anvend fordefinition"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Ret egenskaber"
@@ -13315,11 +13323,4 @@
 msgid "Preparing upload request..."
 msgstr "Forbereder upload-forespørgsel..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14652,5 +14653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14663,5 +14664,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14671,5 +14672,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14680,5 +14681,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: Du kan rette genvejene i indstillingerne.)"
@@ -15055,15 +15056,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15082,18 +15083,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -15262,7 +15263,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Markér WMS-lag"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15795,7 +15795,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Gæstehus"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15833,7 +15832,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Valgfri"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15860,7 +15858,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Mål"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -17312,32 +17309,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Tilbagefør"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Objekthistorik"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Elementets historik"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Fortolker OSM historikdata ..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Forespørg rettesæt"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "anmodet: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relation ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Vis rettesæt {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17573,5 +17571,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17648,11 +17645,11 @@
 msgstr "uventet kolonne-nummer {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Fordefinitionstest"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -17661,5 +17658,5 @@
 "fordefinitions-dialoger"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -18507,57 +18504,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Sletter objekter"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Sletter objekter"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Vælg hvis dataene skal hentes som et nyt lag"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Indtast ID'et fra det objekt der skal downloads"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Sletter objekter"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Sletter objekter"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Start downloading"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Luk dialog og annuller download"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Fil: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Henter {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Punkt {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19327,4 +19316,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Video"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19762,4 +19761,10 @@
 "Du skal gøre dine redigeringer offentlige for at kunne uploade nye data"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "ned"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19969,7 +19974,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Start rettesætsforespørgselsdialogen"
+msgstr ""
 
 #. Plugin routes
@@ -20050,6 +20054,14 @@
 "for de mest udbredte. Integreret stavekontrol for tag-navne."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20060,15 +20072,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20077,5 +20089,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32537,4 +32549,7 @@
 msgstr "Sicilen - Italien"
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Uploader {0} objekter ..."
+
 #~ msgid "Move"
 #~ msgstr "Flyt"
@@ -32633,7 +32648,4 @@
 #~ msgid "There were conflicts during import."
 #~ msgstr "Der var konflikter ved import."
-
-#~ msgid "Revert"
-#~ msgstr "Tilbagefør"
 
 #~ msgid "Cannot connect to server."
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 21299)
+++ applications/editors/josm/i18n/po/de.po	(revision 21304)
@@ -9,7 +9,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-05 08:11+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-16 10:23+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,9 +17,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:51+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -32,12 +32,12 @@
 msgstr "Hilfe"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoriere die ungültige Datei-URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -97,9 +97,9 @@
 msgstr "Warnung"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Der Parameter \"downloadgps\" unterstützt keine Dateinamen oder URLs."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -233,5 +233,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -250,5 +250,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -271,5 +271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -283,4 +283,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -340,4 +341,13 @@
 msgstr "Knoten durch Eingabe von Länge und Breite hinzufügen."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -351,8 +361,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -408,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -462,5 +472,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -471,7 +481,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -489,7 +500,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -557,28 +568,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Nichts ausgewählt, auf das gezoomt werden kann."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Auf {0} zoomen"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ansicht auf {0} zoomen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Anzeige: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Keine Konflikte, auf die gezoomt werden kann"
@@ -671,5 +682,5 @@
 msgstr "{0} Wege verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden."
@@ -719,5 +730,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -812,5 +823,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "OSM Objekttypen auswählen"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -828,5 +839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Objekt herunterladen"
@@ -871,5 +882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -1000,25 +1011,25 @@
 msgstr "Keine Überschneidung gefunden. Es wurde nichts geändert."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Knoten auf allen Schnittpunkten erstellt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Wege entfernen, die nicht Teil des inneren Multipolygons sind"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Relationen korrigieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Selbstüberlappende Gebiete verbunden"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Überlappende Gebiete verbunden"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1028,33 +1039,33 @@
 "prüfen Sie, dass keine Fehler entstanden sind."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Werte für alle Konflikte festlegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Konflikte auflösen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Merkmalskonflikte beheben"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Element aus Relationen entfernt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Flächen verbinden: Kurze Wege entfernen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Weg geschlossen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Merkmale von inneren Wegen entfernen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Funktion zum Flächen verbinden"
@@ -1073,5 +1084,5 @@
 msgstr "Knotenpunkt und Linie vereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Kein Tastenkürzel"
@@ -1534,8 +1545,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1545,5 +1556,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1719,5 +1730,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
 msgid "Delete nodes outside of downloaded data regions"
-msgstr "Konten ausserhalb von Ladebereichen löschen"
+msgstr "Knoten ausserhalb von Ladebereichen löschen"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
@@ -1966,20 +1977,27 @@
 msgstr "Letzte Aktion zurücknehmen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Nichts auswählen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Keine Objekte auswählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Nichts auswählen (Fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Nichts auswählen (Escape)"
@@ -2104,16 +2122,12 @@
 msgstr "Drahtdarstellung umschalten"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Hineinzoomen"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Herauszoomen"
@@ -2335,9 +2349,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2354,52 +2368,52 @@
 "nicht löschen. Strg: Lösche verweisende Objekte."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Knoten setzen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Modus: Zeichnen (Fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Außerhalb der Welt können keine Knoten erstellt werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Knoten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Knoten in einen Weg einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Existierenden Weg mit Knoten verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Einen Knoten in einen bestehenden Weg einfügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Knoten in einen Weg einfügen und verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Einen neuen Knoten erstellen."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Knoten unter Mauszeiger wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2408,14 +2422,14 @@
 msgstr[1] "Neuen Knoten in {0} Wege einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Neuen Weg an letztem Knoten beginnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Weg am letzten Knoten fortsetzen."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Zeichnen beenden."
@@ -2993,5 +3007,5 @@
 msgstr "Relation {0} hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3928,5 +3942,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "Ausgewählt"
@@ -3957,5 +3971,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "Hintergrund"
@@ -4041,9 +4055,9 @@
 msgstr "PUWG-Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polen)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4143,6 +4157,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4262,38 +4276,38 @@
 "wurde: ''{1}'')"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Einstellungen hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Aktuelle Einstellungen auf dem OSM-Server speichern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "Zeichenkette"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Name des Benutzers."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM-Passwort."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Appletgröße auf die angegebenen Werte ändern (Format: BREITExHÖHE)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "Zeichenkette;Zeichenkette;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4303,5 +4317,5 @@
 "oder ein Dateiname sein."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4311,5 +4325,5 @@
 "lat=y&llon=x&zoom=z oder ein Dateiname sein."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4319,9 +4333,9 @@
 "Suchanfrage oder eine URL auf ein osm-xml-Dokument sein."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "jeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
@@ -4329,80 +4343,80 @@
 "verarbeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Benutzername"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Passwort"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "Verwendung"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Optionen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Diese Hilfe anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix Geometrie Argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Bounding Box herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Herunterladen der Position aus der URL (mit lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Eine Datei öffnen (jeder Dateityp, welcher von Datei/Öffnen unterstützt wird)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Bounding Box als GPS-Spuren herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "GPS-Daten am Ort der URL (mit lat=x&lon=y&zoom=z) herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Mit der angegebenen Suche auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Mit maximiertem Fenster starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Die Einstellungen auf Standardwerte zurücksetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Sprache einstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "Optionen über die Java-Systemeinstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PFAD/ZU/JOSM/ORDNER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4416,9 +4430,9 @@
 "festgelegt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "Beispiele"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4428,38 +4442,38 @@
 "Reihenfolge verarbeitet."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "Stellen Sie sicher, dass sie Daten laden, falls Sie --selection verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Plugins aktualisieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Aktualisierte Plugins installieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Zeitige Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Voreinstellungen setzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Hauptfenster erzeugen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4472,5 +4486,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4596,10 +4610,10 @@
 msgstr "Nutzer:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -5051,5 +5065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5306,5 +5320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5312,7 +5326,7 @@
 "you agree?</html>"
 msgstr ""
-"<html>Um Ihre lokale Version zu behalten muss JOSM die ID des Objekts {0} "
-"auf 0 setzen.<br>Beim nächsten Hochladen wird der Server eine neue ID "
-"zuweisen.<br>Möchten Sie fortfahren?</html>"
+"<html>Um Ihre lokale Version zu behalten, muss JOSM<br>die ID des Objekts "
+"{0} auf 0 setzen.<br>Beim nächsten Hochladen wird der Server eine<br>neue ID "
+"zuweisen.<br>Stimmen Sie zu?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5565,6 +5579,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5575,5 +5589,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5887,5 +5901,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5938,7 +5952,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
-#, fuzzy, java-format
+#, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Filter Verst.:{0} Aus:{0}"
+msgstr "Filter: Versteckt:{0} Aus:{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -5960,5 +5974,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Neu laden"
@@ -6014,9 +6028,9 @@
 msgstr "Diese Ebene duplizieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Gewählte Ebene eine Zeile nach oben verschieben."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
@@ -7162,8 +7176,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7828,55 +7842,55 @@
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Relation auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Relation in Hauptauswahl übernehmen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "In Relationsliste auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Relation in Relationsliste auswählen."
@@ -8555,5 +8569,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Grenzen"
@@ -8585,21 +8599,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Suchen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Klicken, um die Suche nach Orten zu starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Suche nach Namen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Suche nach Namen ..."
@@ -8621,5 +8635,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8633,5 +8647,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8667,5 +8681,5 @@
 msgstr "Kachelnummern"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
@@ -8674,9 +8688,9 @@
 "Fehlermeldung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM-Hilfeanzeiger"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8698,5 +8712,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -9015,5 +9029,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Konflikte gefunden"
@@ -9854,7 +9868,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Übertrage {0} Objekte zum Server ..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "{0} Objekt hochladen..."
+msgstr[1] "{0} Objekte hochladen..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -10027,4 +10044,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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-Punkt"
@@ -10199,5 +10217,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10267,19 +10285,19 @@
 msgstr "Datenebene {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "Außerhalb des heruntergeladenen Bereichs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 "Warnung: Das Vermischen von 0.6- und 0.5-Daten resultiert in Version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10288,5 +10306,5 @@
 msgstr[1] "{0} Konflikte wurden entdeckt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10306,5 +10324,5 @@
 "dem Server gelöscht wurden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10321,11 +10339,11 @@
 "Konflikt-Dialog und lösen Sie sie manuell."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Diesen Dialog schließen und Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10334,32 +10352,32 @@
 msgstr[1] "{0} gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "nicht angegeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API-Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Zu GPX-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Datensatzkonsistenzprüfung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "Keine Probleme gefunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Folgende Probleme gefunden:"
@@ -10407,8 +10425,4 @@
 msgstr[1] "{0} Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "GPS-Punkt"
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10700,5 +10714,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
@@ -10723,5 +10737,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Bilddatei von der Platte löschen"
@@ -10755,55 +10769,55 @@
 msgstr "Fehler bei Datei {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Stelle georefernzierte Bilder dar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Vorheriges"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Vorheriges Bild zeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Geoimage: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Photo aus Ebene entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Datein von Platte löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Nächstes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Nächstes Bild zeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Anzeige zentrieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Passend zoomen und 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "Dialog in die Seitenleiste verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10814,5 +10828,5 @@
 "Höhe: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10885,7 +10899,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Texte/Symbole anzeigen/verbergen"
+msgstr "Zeige Text/Symbole"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11822,35 +11835,35 @@
 msgstr "Kalibrierung der Tonaufzeichnung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Farbe"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Zeichenstil {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Wählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Eine Farbe für {0} auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Voreinstellung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Voreinstellung für alle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Farben, die von verschiedenen Objekten in JOSM verwendet werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Farben"
@@ -12323,17 +12336,17 @@
 msgstr "URL der JOSM Plugin Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "ausgeschaltet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "Keine Steuertaste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Tastaturkürzel</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12344,5 +12357,5 @@
 "p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12358,5 +12371,5 @@
 "nachdem hier Änderungen durchgeführt wurden.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12383,9 +12396,9 @@
 "gleiche ist...</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Steuertastengruppen</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12401,5 +12414,5 @@
 "Tastenkürzel zugewiesen.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12409,66 +12422,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Zuerst lesen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Voreinstellungen verwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Ausschalten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Taste:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Achtung: Nur echte Tasten verwenden!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturkürzel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Bearbeitungskürzel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Primäre Steuertasten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Sekundäre Steuertasten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Tertiäre Steuertasten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menükürzel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Hotkey-Kürzel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Unterfensterkürzel"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Steuertastengruppen"
@@ -12529,21 +12542,21 @@
 msgstr "Einige Einstellungen werden erst nach einem Neustart von JOSM wirksam."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Koordinaten anzeigen als"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projektionsmethode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Projektionsbezeichnung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Projektionsmethode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12590,10 +12603,9 @@
 msgstr "Tastaturkürzel manuell anpassen."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Aktion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Tastaturkürzel"
@@ -13125,24 +13137,23 @@
 msgstr "Unbekannter Typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Einlesen von {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente des Typs {0} werden unterstützt."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13152,17 +13163,17 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Nichts ausgewählt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Auswahl unpassend!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Vorlage anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Einstellungen ändern"
@@ -13714,11 +13725,4 @@
 msgid "Preparing upload request..."
 msgstr "Hochladeanfrage vorbereiten..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "{0} Objekt hochladen..."
-msgstr[1] "{0} Objekte hochladen..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14077,7 +14081,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "Fehlendes erforderliches Attribut \"{0}\"."
+msgstr "Fehlender Schlüssel oder Wert im Merkmal"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -14225,7 +14228,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(in Zeile {0}, Spalte {1})"
+msgstr "Zeile {0} Spalte {1}: "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -15195,5 +15198,5 @@
 msgstr "unbenutzt"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -15207,5 +15210,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -15215,5 +15218,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15224,5 +15227,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hinweis: Sie können die Tastaturkürzel in den Einstellungen ändern.)"
@@ -15615,16 +15618,16 @@
 msgstr "Hausnummern:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 "Das Gebäude kann nicht außerhalb der Kartenbegrenzung positioniert werden."
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Erstelle ein Gebäude"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15643,18 +15646,18 @@
 msgstr "Schrittweite:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr "Gebäude zeichnen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr "Auf Gebäudeecke zeigen, um zu beginnen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr "Auf gegenüberliegendes Ende des Gebäudes zeigen"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "Breite des Gebäudes festlegen"
@@ -15838,7 +15841,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "WMS-Ebene wählen"
+msgstr "Erste WMS-Ebene in Liste wählen."
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16395,7 +16397,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Gästehaus (Bed & Breakfast)"
+msgstr "Benutzung der Maus"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -16435,7 +16436,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Optionen"
+msgstr "(optional)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16464,11 +16464,10 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Reduzieren"
+msgstr "Bezirk"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
 msgid "<html>Departement number (optional)</html>"
-msgstr ""
+msgstr "<html>Bezirksnummer (optional)</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
@@ -17957,32 +17956,34 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr "Objektverlauf"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #, fuzzy
-msgid "Objects history"
-msgstr "Objektgeschichte"
+msgid "Revert"
+msgstr "Umkehren"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr "Änderungskorrektur"
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr "Verlaufsdaten vorbereiten..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr "Änderungssatz umkehren"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "History reverter"
-msgstr "Versionsprotokoll"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "OSM-Versionsprotokoll einlesen..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Änderungssätze abfragen"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Fehler: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relation..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Änderungssatz {0} anzeigen"
+msgstr "Änderungssatz {0} umkehren"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18220,5 +18221,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -18295,11 +18295,11 @@
 msgstr "unerwartete Spaltenzahl {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tester für Objektvorlagen"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -18308,5 +18308,5 @@
 "Objektvorlagen zu erhalten."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -19241,57 +19241,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Objekte löschen"
+msgstr "Objekt wiederherstellen..."
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Objekte löschen"
+msgstr "Objekt mittels ID wiederherstellen"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Auswählen, ob die Daten in eine neue Ebene geladen werden sollen"
+msgstr "Auswählen, ob die Daten in eine neue Ebene gespeichert werden sollen"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "ID des herunterzuladenden Objekts eingeben"
+msgstr "ID des wiederherzustellenden Objekts eingeben"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Objekte löschen"
+msgstr "Objekt wiederherstellen"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Objekte löschen"
+msgstr "Objekt wiederherstellen"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Justierung starten"
+msgstr "Wiederherstellen starten"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Fenster schließen und Herunterladen abbrechen"
+msgstr "Dialog schließen und abbrechen"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Datei: {0}"
+msgstr "Erhalte {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "{0} herunterladen"
+msgstr "Suche nach {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Knoten {0}"
+msgstr "{0} gefunden"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -20066,4 +20058,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Videoverleih"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -20515,4 +20517,10 @@
 "hochzuladen."
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "runter"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -20736,7 +20744,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Den Dialog zum Abfragen von Änderungssätzen öffnen"
+msgstr "Plugin zum Umkehren von Änderungssätzen"
 
 #. Plugin routes
@@ -20747,5 +20754,5 @@
 msgstr ""
 "Stellt Routen (Bus, Wanderwege, Fahrradwege, ...) dar. Routentypen werden in "
-"der Datei routes.xml in Pluginverzeichnis definiert."
+"der Datei routes.xml im Pluginverzeichnis definiert."
 
 #. Plugin routing
@@ -20800,16 +20807,15 @@
 #. Plugin turnrestrictions
 #: build/trans_plugins.java:81
-#, fuzzy
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
 msgstr ""
-"Das Plugin \"turnrestrictions\" erlaubt das Erstellen und Bearbeiten von "
-"Abbiege-Regeln in der OpenStreetMap-Datenbank."
+"Das Plugin für Abbiegeeinschränkungen erlaubt die Erstellung und Pflege von "
+"Abbiegeeinschränkungen in der OpenStreetMap-Datenbank."
 
 #. Plugin undelete
 #: build/trans_plugins.java:83
 msgid "Allows undeleting object from OSM database"
-msgstr ""
+msgstr "Erlaubt es Objekte der OSM-Datenbank wiederherzustellen"
 
 #. Plugin validator
@@ -20823,6 +20829,14 @@
 "Schlüsselnamen ist integriert."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20834,15 +20848,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Eine Reihe von nichtverzweigenden verbundenen Wegen auswählen"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20853,5 +20867,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -33315,9 +33329,12 @@
 msgstr "Sizilien - Italien"
 
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Automatisch erste WMS-Ebene auswählen, falls mehrere Ebenen vorhanden "
-#~ "sind."
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Übertrage {0} Objekte zum Server ..."
+
+#~ msgid "GPS point"
+#~ msgstr "GPS-Punkt"
+
+#~ msgid "reverter: {0}"
+#~ msgstr "Umkehrer: {0}"
 
 #~ msgid "to"
@@ -33818,4 +33835,10 @@
 #~ msgstr "nettes Plugin"
 
+#~ msgid ""
+#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
+#~ msgstr ""
+#~ "Automatisch erste WMS-Ebene auswählen, falls mehrere Ebenen vorhanden "
+#~ "sind."
+
 #~ msgid "<number>"
 #~ msgstr "<Zahl>"
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 21299)
+++ applications/editors/josm/i18n/po/el.po	(revision 21304)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
 "PO-Revision-Date: 2010-04-20 18:36+0000\n"
 "Last-Translator: bastik <Unknown>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Βοήθεια"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Αγνοήθηκε κακοσχηματισμένο URL αρχείου:\"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "Προειδοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Η παράμετρος \"downloadgps\" δεν δέχεται ονόματα ή URL αρχείων"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -225,5 +225,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,5 +263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -275,4 +275,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -328,4 +329,13 @@
 msgstr "Προσθήκη κόμβου με εισαγωγή γεωγραφικού πλάτους και μήκους."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -339,8 +349,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -396,5 +406,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -450,5 +460,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -459,7 +469,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -477,7 +488,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -545,28 +556,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Δεν υπάρχει επιλογή στην οποία να γίνει ζουμ."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Ζουμ στο {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ζουμ στο {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Προβολή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Καμοία διένεξη για να γίνει ζουμ"
@@ -657,5 +668,5 @@
 msgstr "Ένωσε {0} διαδρομές"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον δυο διαδρομές προς σύνδεση."
@@ -705,5 +716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -815,5 +826,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Λήψη Αντικειμένου"
@@ -858,5 +869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -991,25 +1002,25 @@
 msgstr "Δεν βρέθηκε διασταύρωση. Τίποτα δεν αλλάχθηκε."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Προστέθηκε κόμβος σε όλες τις διασταυρώσεις"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Δίορθωση σχέσεων"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1017,33 +1028,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Εισάγετε τιμές για όλες τισ διενέξεις."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Επίλυση διενέξεων"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Διόρθωση συγκρούσεων ετικετών"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Αφαιρέθηκε στοιχείο από Σχέσεις"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Λειτουργία ένωσης περιοχών"
@@ -1062,5 +1073,5 @@
 msgstr "Ένωση Κόμβου και Γραμμής"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Καμοία συντόμευση"
@@ -1505,8 +1516,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1516,5 +1527,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1926,20 +1937,27 @@
 msgstr "Αναίρεση της τελευταίας ενέργειας."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Αποεπιλογή όλων"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Αποεπιλογή όλων των αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr ""
@@ -2064,16 +2082,12 @@
 msgstr ""
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Μεγέθυνση"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Σμίκρυνση"
@@ -2283,9 +2297,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2300,52 +2314,52 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Σχεδίαση"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Σχεδίαση κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Δεν μπορείτε να προσθέσετε κόμβο εκτός κόσμου."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Προσθήκη κόμβου"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Πρόσθεση κόμβου σε διαδρομή"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Σύνδεση υπάρχουσας διαδρομής σε κόμβο"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "πρόσθεση νέου κόμβου σε υπάρχουσα διαδρομή"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Πρόσθεση κόμβου σε διαδρομή και σύσνδεση"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Δημιουργία νέου κόμβου."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Επιλογή κόμβου στο σημείο του κέρσορα."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2354,14 +2368,14 @@
 msgstr[1] "Εισαγωγή νέου κόμβου σε {0} διαδρομές."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Έναρξη νέας διαδρομής από τον τελευταίο κόμβο"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Συνέχιση διαδρομής από τον τελευταίο κόμβο"
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Τέλος σχεδιασμού."
@@ -2891,5 +2905,5 @@
 msgstr "Πρόσθεση σχέσης {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3757,5 +3771,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "επιλεγμένο"
@@ -3786,5 +3800,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "φόντο"
@@ -3868,9 +3882,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3968,6 +3982,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4085,38 +4099,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Αποστολή προτιμήσεων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Αποστολή των τρεχουσών προτιμήσεων στον διακομιστή"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "συμβολοσειρά"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Όνομα χρήστη."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Κωδικός OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "συμβολοσειρά;συμβολοσειρά;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4126,5 +4140,5 @@
 "lat=y&lon=x&zoom=z ή το όνομα ενός αρχείου"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4132,5 +4146,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4138,87 +4152,87 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "οποιοδήποτε"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Άν δοθεί, επαναφορά των ρυθμίσεων αντί για ανάγνωση τους."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Κωδικός"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "χρήση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Επιλογές"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Εμφάνιση αυτής της βοήθειας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Λήψη της τοποθεσίας στο URL (με lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Επιλογή με την δοθείσα αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Επαναφορά προτιμήσεων στις προκαθορισμένες"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Επιλογή γλώσσας"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4228,9 +4242,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "παραδείγματα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4240,37 +4254,37 @@
 "αυτή τη σειρά."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Αρχικοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Ενημέρωση πρόσθετων..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Εγκατάσταση ενημερωμένων πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Ρύθμιση προκαθορισμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Δημιουργία κύριου GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Φόρτωση πρόσθετων"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4283,5 +4297,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4405,10 +4419,10 @@
 msgstr "Χρήστης:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "το επίπεδο δεν είναι στη λίστα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4823,5 +4837,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5310,6 +5324,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5320,5 +5334,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5596,5 +5610,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5669,5 +5683,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Επαναφόρτωση"
@@ -5723,9 +5737,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
@@ -6854,8 +6868,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7474,55 +7488,55 @@
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Αλλαγή σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8153,5 +8167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8183,21 +8197,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8219,5 +8233,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8231,5 +8245,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8265,14 +8279,14 @@
 msgstr "Αριθμοί πλακιδίων"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8286,5 +8300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8572,5 +8586,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Εντοπίστηκαν διενέξεις"
@@ -9309,7 +9323,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9466,4 +9483,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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"
@@ -9632,5 +9650,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9695,18 +9713,18 @@
 msgstr "Επίπεδο Δεδομένων {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "εκτός περιοχής λήψης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "έκδοση {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9715,5 +9733,5 @@
 msgstr[1] "Εντοπίστηκαν {0} διενέξεις"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9727,5 +9745,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9738,11 +9756,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9751,32 +9769,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "το {0} αποτελείται από:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Έκδοση API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Μετατροπή σε επίπεδο GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9822,8 +9840,4 @@
 msgstr[1] "{0} σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10098,5 +10112,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
@@ -10121,5 +10135,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10151,55 +10165,55 @@
 msgstr "Σφάλμα στο αρχείο {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Αφαίρεση φωτογραφίας από επίπεδο"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Επόμενο"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Κεντράρισμα επιπέδου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10210,5 +10224,5 @@
 "Υψόμετρο: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10277,7 +10291,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Εμφάνιση/Απόκρυψη Κειμένου/Εικονιδίων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11091,35 +11104,35 @@
 msgstr "Βαθμονόμηση καταγραφέα ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Επιλέξτε"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Επιλέξτε ένα χρώμα για {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Χρώματα που χρησιμοποιούνται από διάφορα αντικείμενα στο JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Χρώματα"
@@ -11565,17 +11578,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "απενεργοποιημένο"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "κανένας τροποποιητής"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Συντομεύσεις Πληκτρολογίου</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11583,5 +11596,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11592,5 +11605,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11607,9 +11620,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Ομάδες τροποποιητών</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11620,5 +11633,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11627,66 +11640,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Διαβάστε πρώτα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Χρήση προκαθορισμένου"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Πλήκτρο:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Προσοχή: Χρησιμοποιείστε πραγματικά κουμπιά πληκρολογίου μόνο!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Συντομεύσεις Πληκτρολογίου"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Επεξεργασία Συντομεύσεων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Κύριος τροποποιητής:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Δευτερεύων τροποποιητής:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Τριτοταγής τροποποιητής:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Συντομεύσεις Μενού"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Συντομεύσεις υπο-παραθύρου"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Ομάδες τροποποιητών"
@@ -11748,21 +11761,21 @@
 msgstr "Πρέπει να επανεκινήσετε το JOSM για να εφαρμοστούν κάποιες ρυθμίσεις."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Εμφάνιση συντεταγένων ως"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Μέθοδος προβολής"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Προβολή Χάρτη"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11807,10 +11820,9 @@
 msgstr "Χειροκίνητη αλλαγή συντομεύσεων πλκτρολογίου."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Ενέργεια"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Συντόμευση"
@@ -12285,24 +12297,23 @@
 msgstr "Άγνωστος τύπος: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Σφάλμα ανάλυσης {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Υποστηρίζονται στοιχεία τύπου {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12312,17 +12323,17 @@
 msgstr[1] "Αλλαγή {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Τίποτα επιλεγμένο!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Εφαρμογή Προεπιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Αλλαγή ιδιοτήτων"
@@ -12833,11 +12844,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14118,5 +14122,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14130,5 +14134,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14138,5 +14142,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14147,5 +14151,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "Συμβουλή: Μπορείτε να αλλάξετε τις συντομεύσεις στις προτιμήσεις"
@@ -14515,15 +14519,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14542,18 +14546,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14720,7 +14724,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Επιλέξτε το επίπεδο στόχο"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15248,7 +15251,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Ξενώνας"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15284,7 +15286,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Προαιρετικό"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15311,7 +15312,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Μετρήσεις"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16768,32 +16768,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Επαναφορά"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Ιστορικό Αντικειμένου"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Ιστορικό του Στοιχείου"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Προετοιμασία δεδομένων OSM..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Κλείσιμο ανοιχτών ομάδων αλλαγών"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "ζητήθηκαν: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Σχέση ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Ομάδα αλλαγών {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17029,5 +17030,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17104,16 +17104,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -17959,57 +17959,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Διαγραφή αντικειμένων"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Διαγραφή αντικειμένων"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Επιλέξτε αν τα δεδομένα πρέπει να ληφθούν σε νέο επίπεδο"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Εισάγετε το αναγνωριστικό του αντικειμένου του οποίου θα γίνει λήψη"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Διαγραφή αντικειμένων"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Διαγραφή αντικειμένων"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Εκκίνηση λήψης"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Κλείσιμο διαλόγου και ακύρωση λήψης"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Αρχείο: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Φόρτωση {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Κόμβος {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18757,4 +18749,14 @@
 msgid "{0}, ..."
 msgstr "{0}, ..."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Προβολή"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19169,4 +19171,10 @@
 msgstr "Πρέπει να κάνετε τις αλλαγές σας δημόσιες για να στείλετε νέα δεδομένα"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "κάτω"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19352,7 +19360,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Κλείσιμο ανοιχτών ομάδων αλλαγών"
+msgstr ""
 
 #. Plugin routes
@@ -19424,6 +19431,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19435,15 +19450,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19452,5 +19467,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32211,7 +32226,4 @@
 #~ msgstr "Επεξεργασία Ιδιοτήτων"
 
-#~ msgid "Revert"
-#~ msgstr "Επαναφορά"
-
 #~ msgid ""
 #~ "Revert the state of all currently selected objects to the version "
Index: applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- applications/editors/josm/i18n/po/en_AU.po	(revision 21299)
+++ applications/editors/josm/i18n/po/en_AU.po	(revision 21304)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
 "PO-Revision-Date: 2010-03-28 15:27+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:52+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoring malformed file URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "Warning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" does not accept file names or file URLs"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -231,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -248,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -269,5 +269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -281,4 +281,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -336,4 +337,13 @@
 msgstr "Add a node by entering latitude and longitude."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -347,8 +357,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -404,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -458,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -467,7 +477,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -485,7 +496,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -553,28 +564,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Nothing selected to zoom to."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom to {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom the view to {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "View: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "No conflicts to zoom to"
@@ -667,5 +678,5 @@
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Please select at least two ways to combine."
@@ -715,5 +726,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -824,5 +835,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Download object"
@@ -867,5 +878,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -994,25 +1005,25 @@
 msgstr "No intersection found. Nothing was changed."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Added node on all intersections"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Delete Ways that are not part of an inner multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Fix relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Joined self-overlapping area"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Joined overlapping areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1022,33 +1033,33 @@
 "verify no errors have been introduced."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Enter values for all conflicts."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Solve Conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Fix tag conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Removed Element from Relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Join Areas: Remove Short Ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Closed Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Remove tags from inner ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Join Areas Function"
@@ -1067,5 +1078,5 @@
 msgstr "Join Node and Line"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "No Shortcut"
@@ -1524,8 +1535,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1535,5 +1546,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1951,20 +1962,27 @@
 msgstr "Undo the last action."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Unselect All"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Unselect all objects."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Unselect All (Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Unselect All (Escape)"
@@ -2087,16 +2105,12 @@
 msgstr "Toggle Wireframe view"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Zoom In"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zoom Out"
@@ -2314,9 +2328,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2333,52 +2347,52 @@
 "when deleting a way. Ctrl: delete referring objects."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Draw"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Draw nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Mode: Draw Focus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Cannot add a node outside of the world."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Add node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Add node into way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Connect existing way to node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Add a new node to an existing way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Add node into way and connect"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Create new node."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Select node under cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2387,14 +2401,14 @@
 msgstr[1] "Insert new node into {0} ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Start new way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Continue way from last node."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Finish drawing."
@@ -2949,5 +2963,5 @@
 msgstr "Add relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3861,5 +3875,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "selected"
@@ -3890,5 +3904,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "background"
@@ -3974,9 +3988,9 @@
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4075,6 +4089,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4192,38 +4206,38 @@
 msgstr "Expected non-empty value for parameter ''{0}'', got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Upload Preferences"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Upload the current preferences to the server"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "string"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Name of the user."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM Password."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "string;string;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4233,5 +4247,5 @@
 "filename"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4241,5 +4255,5 @@
 "lat=y&lon=x&zoom=z or a filename"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4249,87 +4263,87 @@
 "URL which returns osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "any"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "If specified, reset the configuration instead of reading it."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Username"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4343,9 +4357,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4355,37 +4369,37 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4398,5 +4412,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4522,10 +4536,10 @@
 msgstr "User:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "layer not in list."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4967,5 +4981,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5219,5 +5233,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5225,7 +5239,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>To keep your local version, JOSM<br>has to reset the id of primitive "
-"{0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-"yo agree?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5475,6 +5486,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5485,5 +5496,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5783,5 +5794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5856,5 +5867,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Reload"
@@ -5910,9 +5921,9 @@
 msgstr "Duplicate this layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Move the selected layer one row up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Move the selected layer one row down."
@@ -7049,8 +7060,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7701,55 +7712,55 @@
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -8413,5 +8424,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Bounds"
@@ -8443,21 +8454,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer exception, possibly some missing tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Search ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Click to start searching for places"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Querying name server"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Querying name server ..."
@@ -8479,5 +8490,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8491,5 +8502,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8525,14 +8536,14 @@
 msgstr "Tile Numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM Help Browser"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8553,5 +8564,5 @@
 "a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8861,5 +8872,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Conflicts detected"
@@ -9670,7 +9681,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Uploading {0} objects ..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Uploading {0} object..."
+msgstr[1] "Uploading {0} objects..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9838,4 +9852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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 point"
@@ -10010,5 +10025,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10076,18 +10091,18 @@
 msgstr "Data Layer {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10096,5 +10111,5 @@
 msgstr[1] "There were {0} conflicts detected."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10113,5 +10128,5 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10128,11 +10143,11 @@
 "Dialogue and manually resolve them."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Click to close this dialogue and continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10141,32 +10156,32 @@
 msgstr[1] "{0} deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "unset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convert to GPX layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Dataset consistency test"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "No problems found"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Following problems found:"
@@ -10214,8 +10229,4 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "GPS point"
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10504,5 +10515,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
@@ -10527,5 +10538,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
@@ -10559,55 +10570,55 @@
 msgstr "Error on file {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Display geotagged images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Previous"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Show previous Image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Geoimage: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Remove photo from layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Delete File from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Next"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Show next Image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centre view"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Zoom best fit and 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "Move dialogue to the side pane"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10618,5 +10629,5 @@
 "Altitude: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10686,7 +10697,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Show/Hide Text/Icons"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11593,35 +11603,35 @@
 msgstr "Voice recorder calibration"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Paint style {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Choose"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choose a colour for {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Set to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Set all to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Colours used by different objects in JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Colours"
@@ -12080,17 +12090,17 @@
 msgstr "JOSM Plug-in description URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "disabled"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "no modifier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12100,5 +12110,5 @@
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12114,5 +12124,5 @@
 "</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12140,9 +12150,9 @@
 "p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Modifier Groups</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12158,5 +12168,5 @@
 "already taken, it will assign a random shortcut instead.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12167,66 +12177,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Read First"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Use default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Disable"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Key:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Attention: Use real keyboard keys only!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Edit Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Primary modifier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Secondary modifier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Tertiary modifier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menu Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Hotkey Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Subwindow Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Modifier Groups"
@@ -12289,21 +12299,21 @@
 msgstr "You have to restart JOSM for some settings to take effect."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Display coordinates as"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projection method"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Projection code"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Map Projection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12348,10 +12358,9 @@
 msgstr "Changing keyboard shortcuts manually."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Action"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Shortcut"
@@ -12863,24 +12872,23 @@
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elements of type {0} are supported."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12890,17 +12898,17 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Change Properties"
@@ -13441,11 +13449,4 @@
 msgid "Preparing upload request..."
 msgstr "Preparing upload request..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Uploading {0} object..."
-msgstr[1] "Uploading {0} objects..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13782,7 +13783,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "Missing required attribute ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -13926,7 +13926,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(at line {0}, column {1})"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -14866,5 +14866,5 @@
 msgstr "unused"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14877,5 +14877,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14885,5 +14885,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14894,5 +14894,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hint: You can edit the shortcuts in the preferences.)"
@@ -15276,15 +15276,15 @@
 msgstr "Numbers:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr "Cannot place building outside of the world."
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Create building"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15303,18 +15303,18 @@
 msgstr "Length step:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr "Draw buildings"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr "Point on angle of building to start drawing"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr "Point on opposite end of building"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "Set width of building"
@@ -15494,7 +15494,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Select WMS layer"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16045,7 +16044,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Guest House"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -16083,7 +16081,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "options"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16112,7 +16109,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Decrement"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -17581,32 +17577,34 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #, fuzzy
-msgid "Objects history"
-msgstr "Object history"
+msgid "Revert"
+msgstr "Reverse"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "History reverter"
-msgstr "History"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Parsing OSM history data ..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Query changesets"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Error: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relation ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Show changeset {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17842,5 +17840,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17917,11 +17914,11 @@
 msgstr "unexpected column number {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tagging Preset Tester"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -17929,5 +17926,5 @@
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "You have to specify tagging preset sources in the preferences first."
@@ -18773,57 +18770,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Delete objects"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Delete objects"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Select if the data should be downloaded into a new layer"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Enter the ID of the object that should be downloaded"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Delete objects"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Delete objects"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Start adjusting"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Close dialogue and cancel downloading"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "File: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Loading {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Node {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19585,4 +19574,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Video"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -20020,4 +20019,10 @@
 msgstr "You must make your edits public to upload new data"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "down"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -20234,7 +20239,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Launch the dialogue for querying changesets"
+msgstr ""
 
 #. Plugin routes
@@ -20317,6 +20321,14 @@
 "for the common ones. Spellcheck integrated for tag names."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20327,15 +20339,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20346,5 +20358,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32807,4 +32819,13 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Uploading {0} objects ..."
+
+#~ msgid "GPS point"
+#~ msgstr "GPS point"
+
+#~ msgid "Gauss-Laborde Réunion 1947"
+#~ msgstr "Gauss-Laborde Réunion 1947"
+
 #~ msgid ""
 #~ "Automaticly select first WMS layer when grabing if multiple layers exist."
@@ -32812,7 +32833,4 @@
 #~ "Automaticly select first WMS layer when grabing if multiple layers exist."
 
-#~ msgid "Gauss-Laborde Réunion 1947"
-#~ msgstr "Gauss-Laborde Réunion 1947"
-
 #~ msgid "Bikes"
 #~ msgstr "Bikes"
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 21299)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 21304)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
 "PO-Revision-Date: 2010-04-23 22:27+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -19,9 +19,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -34,12 +34,12 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoring malformed file URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -78,5 +78,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -99,9 +99,9 @@
 msgstr "Warning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" does not accept file names or file URLs"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -121,8 +121,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -234,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -272,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -284,4 +284,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -339,4 +340,13 @@
 msgstr "Add a node by entering latitude and longitude."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -350,8 +360,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -407,5 +417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -461,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -470,7 +480,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -488,7 +499,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -556,28 +567,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Nothing selected to zoom to."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom to {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom the view to {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "View: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "No conflicts to zoom to"
@@ -670,5 +681,5 @@
 msgstr "Combine {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Please select at least two ways to combine."
@@ -718,5 +729,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -827,5 +838,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Download object"
@@ -870,5 +881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -997,25 +1008,25 @@
 msgstr "No intersection found. Nothing was changed."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Added node on all intersections"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Delete Ways that are not part of an inner multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Fix relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Joined self-overlapping area"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Joined overlapping areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1025,33 +1036,33 @@
 "verify no errors have been introduced."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Enter values for all conflicts."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Solve Conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Fix tag conflicts"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Removed Element from Relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Join Areas: Remove Short Ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Closed Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Remove tags from inner ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Join Areas Function"
@@ -1070,5 +1081,5 @@
 msgstr "Join Node and Line"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "No Shortcut"
@@ -1527,8 +1538,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1538,5 +1549,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1954,20 +1965,27 @@
 msgstr "Undo the last action."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Unselect All"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Unselect all objects."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Unselect All (Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Unselect All (Escape)"
@@ -2090,16 +2108,12 @@
 msgstr "Toggle Wireframe view"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Zoom In"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zoom Out"
@@ -2317,9 +2331,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2336,52 +2350,52 @@
 "when deleting a way. Ctrl: delete referring objects."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Draw"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Draw nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Mode: Draw Focus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Cannot add a node outside of the world."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Add node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Add node into way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Connect existing way to node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Add a new node to an existing way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Add node into way and connect"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Create new node."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Select node under cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2390,14 +2404,14 @@
 msgstr[1] "Insert new node into {0} ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Start new way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Continue way from last node."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Finish drawing."
@@ -2952,5 +2966,5 @@
 msgstr "Add relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3864,5 +3878,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "selected"
@@ -3893,5 +3907,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "background"
@@ -3977,9 +3991,9 @@
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4078,6 +4092,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4195,38 +4209,38 @@
 msgstr "Expected non-empty value for parameter ''{0}'', got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Upload Preferences"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Upload the current preferences to the server"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "string"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Name of the user."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM Password."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "string;string;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4236,5 +4250,5 @@
 "filename"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4244,5 +4258,5 @@
 "lat=y&lon=x&zoom=z or a filename"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4252,87 +4266,87 @@
 "URL which returns osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "any"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "If specified, reset the configuration instead of reading it."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Username"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Show this help"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Download the bounding box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "Open a file (any file type that can be opened with File/Open)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Download the bounding box as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Select with the given search"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Launch in maximised mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Reset the preferences to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Set the language"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "options provided as Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Change the folder for all user settings"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4346,9 +4360,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "examples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4358,37 +4372,37 @@
 "order."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Make sure you load some data if you use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialising"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Updating plug-ins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installing updated plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Loading early plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Setting defaults"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creating main GUI"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Loading plug-ins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4401,5 +4415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4525,10 +4539,10 @@
 msgstr "User:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "layer not in list."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4970,5 +4984,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5222,5 +5236,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5228,7 +5242,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>To keep your local version, JOSM<br>has to reset the id of primitive "
-"{0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-"yo agree?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5478,6 +5489,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5488,5 +5499,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5786,5 +5797,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5859,5 +5870,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Reload"
@@ -5913,9 +5924,9 @@
 msgstr "Duplicate this layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Move the selected layer one row up."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Move the selected layer one row down."
@@ -7052,8 +7063,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7712,55 +7723,55 @@
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -8424,5 +8435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Bounds"
@@ -8454,21 +8465,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer exception, possibly some missing tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Search ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Click to start searching for places"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Querying name server"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Querying name server ..."
@@ -8490,5 +8501,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8502,5 +8513,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8536,14 +8547,14 @@
 msgstr "Tile Numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM Help Browser"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8564,5 +8575,5 @@
 "a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8872,5 +8883,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Conflicts detected"
@@ -9681,7 +9692,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Uploading {0} objects ..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Uploading {0} object..."
+msgstr[1] "Uploading {0} objects..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9849,4 +9863,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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 point"
@@ -10021,5 +10036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10087,18 +10102,18 @@
 msgstr "Data Layer {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10107,5 +10122,5 @@
 msgstr[1] "There were {0} conflicts detected."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10124,5 +10139,5 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10139,11 +10154,11 @@
 "Dialogue and manually resolve them."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Click to close this dialogue and continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10152,32 +10167,32 @@
 msgstr[1] "{0} deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "unset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convert to GPX layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Dataset consistency test"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "No problems found"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Following problems found:"
@@ -10225,8 +10240,4 @@
 msgstr[1] "{0} points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "GPS point"
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10515,5 +10526,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
@@ -10538,5 +10549,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
@@ -10570,55 +10581,55 @@
 msgstr "Error on file {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Display geotagged images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Previous"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Show previous Image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Geoimage: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Remove photo from layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Delete File from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Next"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Show next Image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centre view"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Zoom best fit and 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "Move dialogue to the side pane"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10629,5 +10640,5 @@
 "Altitude: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10697,7 +10708,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Show/Hide Text/Icons"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11606,35 +11616,35 @@
 msgstr "Voice recorder calibration"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Paint style {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Choose"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choose a colour for {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Set to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Set all to default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Colours used by different objects in JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Colours"
@@ -12093,17 +12103,17 @@
 msgstr "JOSM Plug-in description URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "disabled"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "no modifier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12113,5 +12123,5 @@
 "started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12127,5 +12137,5 @@
 "</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12153,9 +12163,9 @@
 "p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Modifier Groups</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12171,5 +12181,5 @@
 "already taken, it will assign a random shortcut instead.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12180,66 +12190,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Read First"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Use default"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Disable"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Key:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Attention: Use real keyboard keys only!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Edit Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Primary modifier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Secondary modifier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Tertiary modifier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menu Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Hotkey Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Subwindow Shortcuts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Modifier Groups"
@@ -12302,21 +12312,21 @@
 msgstr "You have to restart JOSM for some settings to take effect."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Display coordinates as"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projection method"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Projection code"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Map Projection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12361,10 +12371,9 @@
 msgstr "Changing keyboard shortcuts manually."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Action"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Shortcut"
@@ -12876,24 +12885,23 @@
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elements of type {0} are supported."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12903,17 +12911,17 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Change Properties"
@@ -13454,11 +13462,4 @@
 msgid "Preparing upload request..."
 msgstr "Preparing upload request..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Uploading {0} object..."
-msgstr[1] "Uploading {0} objects..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13795,7 +13796,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "Missing required attribute ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -13939,7 +13939,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(at line {0}, column {1})"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -14887,5 +14887,5 @@
 msgstr "unused"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14898,5 +14898,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14906,5 +14906,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14915,5 +14915,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hint: You can edit the shortcuts in the preferences.)"
@@ -15297,15 +15297,15 @@
 msgstr "Numbers:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr "Cannot place building outside of the world."
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Create building"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15324,18 +15324,18 @@
 msgstr "Length step:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr "Draw buildings"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr "Point on angle of building to start drawing"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr "Point on opposite end of building"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "Set width of building"
@@ -15517,7 +15517,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Select WMS layer"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16068,7 +16067,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Guest House"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -16106,7 +16104,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Optional"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16135,7 +16132,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Decrement"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -17604,32 +17600,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Revert"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Object history"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "History item"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Parsing OSM history data ..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Query changesets"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "requested: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relation ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Show changeset {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17865,5 +17862,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17940,11 +17936,11 @@
 msgstr "unexpected column number {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tagging Preset Tester"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -17952,5 +17948,5 @@
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "You have to specify tagging preset sources in the preferences first."
@@ -18816,57 +18812,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Delete objects"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Delete objects"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Select if the data should be downloaded into a new layer"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Enter the ID of the object that should be downloaded"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Delete objects"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Delete objects"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Start adjusting"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Close dialogue and cancel downloading"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "File: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Loading {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Node {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19628,4 +19616,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Video"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -20063,4 +20061,10 @@
 msgstr "You must make your edits public to upload new data"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "down"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -20277,7 +20281,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Launch the dialogue for querying changesets"
+msgstr ""
 
 #. Plugin routes
@@ -20345,4 +20348,6 @@
 "restrictions in the OpenStreetMap database."
 msgstr ""
+"The turnrestrictions plugin allows to enter maintain information about turn "
+"restrictions in the OpenStreetMap database."
 
 #. Plugin undelete
@@ -20360,6 +20365,14 @@
 "for the common ones. Spellcheck integrated for tag names."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20370,15 +20383,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Select a sequence of non-branching connected ways"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20389,5 +20402,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32850,8 +32863,9 @@
 msgstr "Sicily - Italy"
 
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Uploading {0} objects ..."
+
+#~ msgid "GPS point"
+#~ msgstr "GPS point"
 
 #~ msgid "Move"
@@ -33013,7 +33027,4 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Click Reload to refresh list"
-
-#~ msgid "Revert"
-#~ msgstr "Revert"
 
 #~ msgid ""
@@ -34577,2 +34588,7 @@
 #~ msgid "Error: "
 #~ msgstr "Error: "
+
+#~ msgid ""
+#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
+#~ msgstr ""
+#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 21299)
+++ applications/editors/josm/i18n/po/es.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-08 09:14+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-11 08:30+0000\n"
+"Last-Translator: Jonay <jonay.santana@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:51+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Ayuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de archivo malformado: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,10 +96,10 @@
 msgstr "Aviso"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "El parámetro \"downloadgps\" no acepta nombres de archivo o URLs de archivo."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -234,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -272,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -284,4 +284,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -338,4 +339,13 @@
 msgstr "Añadir nodo entrando latitud y longitud."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -349,8 +359,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -406,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -460,5 +470,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -469,7 +479,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -487,7 +498,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -555,28 +566,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Nada seleccionado a lo que hacer zoom"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoom de la vista a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "No existen conflictos a los que hacer zoom"
@@ -669,5 +680,5 @@
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona al menos dos vías para combinar."
@@ -717,5 +728,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -813,5 +824,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Elija el tipo de objeto de OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -829,5 +840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Descargar objeto"
@@ -873,5 +884,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -1005,25 +1016,25 @@
 msgstr "No se encontró ninguna intersección. Nada ha cambiado."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Nodo añadido en todas las intersecciones"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Eliminar vías que no formen parte de un multipolígono interior"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Arreglar relaciones"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Fusionar área superpuesta consigo misma"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Fusionar áreas superpuestas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1033,33 +1044,33 @@
 "favor, compruebe los errores no se han introducido."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Introduzca valores para todos los conflictos."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Resolver conflictos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Arreglar conflictos de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Eliminar elementos de las relaciones"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Fusionar áreas: eliminar las vías cortas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Vía cerrada"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Eliminar etiquetas de vías internas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Función para la fusión de áreas"
@@ -1078,5 +1089,5 @@
 msgstr "Unir nodo y línea"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Sin acceso directo"
@@ -1549,8 +1560,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1560,5 +1571,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1976,20 +1987,27 @@
 msgstr "Deshacer la última acción"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Deseleccionar todo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Deseleccionar todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Deseleccionar todas (Foco)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Deseleccionar todos (Escape)"
@@ -2116,16 +2134,12 @@
 msgstr "Interruptor de la vista de rejilla"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Acercar"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Alejar"
@@ -2344,9 +2358,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2363,52 +2377,52 @@
 "los nodos sin usar al borrar una vía. Con Ctrl: borrar los objetos referidos."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Dibujar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Dibujar nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Modo: Dibujar foco"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "No se puede añadir un nodo fuera del mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Añadir nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Añadir nodo a la vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Conectar la vía existente al nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Añadir un nodo nuevo a una vía existente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Añadir un nodo a la vía y conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Crear un nodo nuevo."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Seleccionar el nodo bajo el cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2417,14 +2431,14 @@
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Comenzar una nueva vía desde el último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Continuar la vía desde el último nodo."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Finalizar dibujo."
@@ -2999,5 +3013,5 @@
 msgstr "Añadir relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3924,5 +3938,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "seleccionado"
@@ -3953,5 +3967,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "fondo"
@@ -4037,9 +4051,9 @@
 msgstr "Zona PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4139,6 +4153,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4257,38 +4271,38 @@
 "Esperado un valor no-vacío para el parámetro ''{0}'', suministrado ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Subir preferencias"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Subir las preferencias actuales al servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "cadena de caracteres"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Nombre del usuario."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Contraseña de OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Reescale a la geometría dada ( formato: ANCHO x ALTO )"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "cadena;cadena;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4298,5 +4312,5 @@
 "lat=y&lon=x&zoom=z  o un archivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4306,5 +4320,5 @@
 "contenga lat=y&lon=x&zoom=z o un nombre de archivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4314,88 +4328,88 @@
 "estilo google o una URL que devuelva xml de osm"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "cualquier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Si se especifica, reinicie la configuración en lugar de leerla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Contraseña"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Mostrar esta ayuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argumento de geometría standard de unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Bajar el rectángulo límite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Bajar la posición de la URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Abrir archivo (cualquier tipo de archivo que puede abrirse con Archivo/Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Bajar el rectángulo límite como gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Descargar datos GPS desde URL (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Seleccionar dentro de la búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Restablecer las preferencias a los valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Definir idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "opciones proporcionadas como propiedades de sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Cambiar la carpeta para todas las configuraciones de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4409,9 +4423,9 @@
 "en megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "ejemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4421,37 +4435,37 @@
 "esta orden."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Hay que cargar algún dato si se usa --selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicializar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Actualizando complementos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Instalando complementos actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Cargando los primeros complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Ajustes predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creando la interfaz principal de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Cargando los complementos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4464,5 +4478,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4589,10 +4603,10 @@
 msgstr "Usuario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -5052,5 +5066,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5305,5 +5319,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5311,7 +5325,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>Para mantener su versión local, JOSM<br>tiene que poner a 0 el ID de "
-"los objetos {0} to 0.<br>En la siguiente subida, el servidor asignará una "
-"nueva ID.<br> ¿Continuar? </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5569,6 +5580,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5579,5 +5590,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5877,5 +5888,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5928,7 +5939,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
-#, fuzzy, java-format
+#, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Filtrar ocultos: {0} Desactivados: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -5950,5 +5961,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Recargar"
@@ -6005,9 +6016,9 @@
 msgstr "Duplicar esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Mover la capa seleccionada una fila arriba"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Mover la capa seleccionada una fila abajo"
@@ -7152,8 +7163,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7811,55 +7822,55 @@
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "¿Seguro de eliminar la selección de la relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Seleccionar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Seleccionar la relación en la selección principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Seleccionar en la lista de relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Seleccionar relación en la lista de relaciones."
@@ -8528,5 +8539,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Límites"
@@ -8558,21 +8569,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Buscar..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Haga click para empezar a buscar lugares"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8594,5 +8605,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8606,5 +8617,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8640,14 +8651,14 @@
 msgstr "Números de teselas"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "No se pudo leer el archivo CSS \"help-browser.css\". Excepción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "Navegador de ayuda de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8661,5 +8672,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8955,5 +8966,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Se han detectado conflictos"
@@ -9731,7 +9742,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Subiendo {0} objetos..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Subiendo {0} objeto..."
+msgstr[1] "Subiendo {0} objetos..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9891,4 +9905,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "punto GPS"
@@ -10057,5 +10072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10124,18 +10139,18 @@
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10144,5 +10159,5 @@
 msgstr[1] "Se han detectado {0} conflictos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10156,5 +10171,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10171,11 +10186,11 @@
 "dialogo de Conflictos y resuélvalos manualmente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10184,32 +10199,32 @@
 msgstr[1] "{0} eliminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Versión del API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa de gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "No se han encontrado problemas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -10255,8 +10270,4 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "Punto GPS"
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10547,5 +10558,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
@@ -10570,5 +10581,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Borrar archivo de imagen del disco"
@@ -10600,55 +10611,55 @@
 msgstr "Error en archivo {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Mostrar imagen previa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Eliminar foto de la capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Borrar archivo del disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Mostrar imagen siguiente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centrar vista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Zoom a mejor ajuste y 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10659,5 +10670,5 @@
 "Altitud: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10727,7 +10738,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Mostrar/Esconder Texto/Iconos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11570,35 +11580,35 @@
 msgstr "Calibración del grabador de voz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Estilo de representación {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Seleccionar un color para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Establecer como predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Establecer todo como predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Colores usados por diferentes objetos en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Colores"
@@ -12060,17 +12070,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "descativado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "sin modificador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Atajos de Teclado</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12078,5 +12088,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12087,5 +12097,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12102,9 +12112,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Grupos de modificadores</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12115,5 +12125,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12124,66 +12134,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Leer primero"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Usar por defecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Clave:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "¡Atención: use solamente teclas reales de su teclado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Editar atajos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Modificador primario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Modificador secundario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Modificador terciario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Atajos de menú"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Atajos de teclado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Accesos directos a subventanas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Grupos de modificadores"
@@ -12244,21 +12254,21 @@
 msgstr "Debes reiniciar JOSM para que las preferencias tengan efecto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Visualizar las coordenadas como"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Método de proyección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Código de proyección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Proyección del mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12303,10 +12313,9 @@
 msgstr "Cambiando los atajos de teclado manualmente"
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Acción"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Atajo de teclado"
@@ -12795,24 +12804,23 @@
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Los elementos del tipo {0} son soportados"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12822,17 +12830,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Cambiar propiedades"
@@ -13347,11 +13355,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Subiendo {0} objeto..."
-msgstr[1] "Subiendo {0} objetos..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14679,5 +14680,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14691,5 +14692,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14699,5 +14700,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14708,5 +14709,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Pista: Usted puede editar los atajos en las preferencias.)"
@@ -15095,15 +15096,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15122,18 +15123,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -15302,7 +15303,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Seleccionar capa WMS"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15847,7 +15847,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Pensión"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15883,7 +15882,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Opcional"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15912,7 +15910,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Mediciones"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -17390,32 +17387,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Revertir"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Historial del objeto"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Historial del elemento"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Analizando historial de datos OSM..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Consultar modificaciones"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "solicitado:{0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relación..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Mostrar conjunto de cambios {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17653,5 +17651,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17728,11 +17725,11 @@
 msgstr "Número de columnas inexperado {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Test de etiquetas preestablecidas"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -17741,5 +17738,5 @@
 "previsualizar los diálogos de etiquetas preestablecidas."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -18397,20 +18394,20 @@
 msgctxt "keyboard-modifiers"
 msgid "Shift"
-msgstr ""
+msgstr "Mayús"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:80
 msgctxt "keyboard-modifiers"
 msgid "Ctrl"
-msgstr ""
+msgstr "Ctrl"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:82
 msgctxt "keyboard-modifiers"
 msgid "Alt"
-msgstr ""
+msgstr "Alt"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:85
 msgctxt "keyboard-modifiers"
 msgid "Meta"
-msgstr ""
+msgstr "Meta"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:29
@@ -18425,5 +18422,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
 msgid "Delete ''from''"
-msgstr ""
+msgstr "Borrar \"de\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38
@@ -18433,5 +18430,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47
 msgid "Delete ''to''"
-msgstr ""
+msgstr "Borrar \"a\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48
@@ -18447,5 +18444,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:80
 msgid "Fix in editor"
-msgstr ""
+msgstr "Arreglar en el editor"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:58
@@ -18512,5 +18509,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
 msgid "Add in editor"
-msgstr ""
+msgstr "Añadir en el editor"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
@@ -18528,4 +18525,6 @@
 "turn restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"Una restricción de giro requiere exactamente una vía con el rol <tt>de</tt>. "
+"Esta restricción de giro tiene {0} vías en su rol. Elimine {1} de ellas."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
@@ -18602,5 +18601,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63
 msgid "Delete the member from the turn restriction"
-msgstr ""
+msgstr "Borra el miembro de la restricción de giro"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81
@@ -18609,57 +18608,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Borrar objetos"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Borrar objetos"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Seleccionar si los datos deben ser descargados en una nueva capa"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Introduce el ID del objeto que desees descargar"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Borrar objetos"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Borrar objetos"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Inicio de ajuste"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Archivo: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Cargando {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Nodo {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19268,5 +19259,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Incorrect number of parameters"
-msgstr ""
+msgstr "Número incorrecto de parámetros"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990
@@ -19440,4 +19431,14 @@
 msgid "{0}, ..."
 msgstr "{0}, ..."
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Video"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
@@ -19883,4 +19884,10 @@
 msgstr "Debe hacer públicas sus ediciones para subir nuevos datos"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "abajo"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -20097,4 +20104,5 @@
 "This plugin simplifies the mapping and editing of public transport routes."
 msgstr ""
+"Este plugin simplifica el mapeo y editado de rutas de transportes públicos."
 
 #. Plugin remotecontrol
@@ -20105,7 +20113,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Muestra el diálogo para consultar modificaciones"
+msgstr ""
 
 #. Plugin routes
@@ -20191,6 +20198,14 @@
 "una corrector ortográfico para los nombres de las etiquetas."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20201,5 +20216,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -20207,10 +20222,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20219,5 +20234,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21316,5 +21331,5 @@
 #: build/trans_presets.java:377
 msgid "Agricultural"
-msgstr ""
+msgstr "Agrícola"
 
 #: build/trans_presets.java:377 build/trans_presets.java:378
@@ -22348,13 +22363,13 @@
 #: build/trans_presets.java:814
 msgid "fence"
-msgstr ""
+msgstr "valla"
 
 #: build/trans_presets.java:814
 msgid "wood_fence"
-msgstr ""
+msgstr "valla_de_madera"
 
 #: build/trans_presets.java:814
 msgid "wire_fence"
-msgstr ""
+msgstr "valla_de_alambre"
 
 #: build/trans_presets.java:816
@@ -22916,5 +22931,5 @@
 #: build/trans_presets.java:1226
 msgid "Types"
-msgstr ""
+msgstr "Tipos"
 
 #. item "Transport/Railway/Rail" combo "Types"
@@ -22952,5 +22967,5 @@
 #: build/trans_presets.java:1227
 msgid "Electrified"
-msgstr ""
+msgstr "Electrificado"
 
 #. item "Transport/Railway/Rail" combo "Electrified"
@@ -23065,5 +23080,5 @@
 #: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
-msgstr ""
+msgstr "Frecuencia (Hz)"
 
 #. item "Transport/Railway/Rail" combo "Frequency (Hz)"
@@ -23079,5 +23094,5 @@
 #: build/trans_presets.java:1229
 msgid "16.7"
-msgstr ""
+msgstr "16.7"
 
 #. </optional>
@@ -23304,21 +23319,21 @@
 #: build/trans_presets.java:1330
 msgid "Agip"
-msgstr ""
+msgstr "Agip"
 
 #: build/trans_presets.java:1330
 msgid "Aral"
-msgstr ""
+msgstr "Aral"
 
 #: build/trans_presets.java:1330
 msgid "Avia"
-msgstr ""
+msgstr "Avia"
 
 #: build/trans_presets.java:1330
 msgid "BP"
-msgstr ""
+msgstr "BP"
 
 #: build/trans_presets.java:1330
 msgid "Esso"
-msgstr ""
+msgstr "Esso"
 
 #: build/trans_presets.java:1330
@@ -23328,29 +23343,29 @@
 #: build/trans_presets.java:1330
 msgid "Q8"
-msgstr ""
+msgstr "Q8"
 
 #: build/trans_presets.java:1330
 msgid "Repsol"
-msgstr ""
+msgstr "Repsol"
 
 #: build/trans_presets.java:1330
 msgid "Shell"
-msgstr ""
+msgstr "Shell"
 
 #: build/trans_presets.java:1330
 msgid "Statoil"
-msgstr ""
+msgstr "Statoil"
 
 #: build/trans_presets.java:1330
 msgid "Tamoil"
-msgstr ""
+msgstr "Tamoil"
 
 #: build/trans_presets.java:1330
 msgid "Texaco"
-msgstr ""
+msgstr "Texaco"
 
 #: build/trans_presets.java:1330
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #: build/trans_presets.java:1330
@@ -32667,15 +32682,15 @@
 #: build/trans_wms.java:40
 msgid "MLIT Japan (ORTHO01)"
-msgstr ""
+msgstr "MLIT Japón (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:41
 msgid "MLIT Japan (ORTHO02)"
-msgstr ""
+msgstr "MLIT Japón (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:42
 msgid "MLIT Japan (ORTHO03)"
-msgstr ""
+msgstr "MLIT Japón (ORTHO03)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
@@ -32691,4 +32706,10 @@
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
+
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Subiendo {0} objetos..."
+
+#~ msgid "GPS point"
+#~ msgstr "Punto GPS"
 
 #~ msgid "Move"
@@ -33004,7 +33025,4 @@
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Por favor presente una \"ticket\" en {0}"
-
-#~ msgid "Revert"
-#~ msgstr "Revertir"
 
 #~ msgid "Commit comment"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 21299)
+++ applications/editors/josm/i18n/po/et.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-25 00:45+0000\n"
-"Last-Translator: lyyser <logard.1961@gmail.com>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-15 17:26+0000\n"
+"Last-Translator: BloodDw <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:53+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Abi"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignoreerin vigast faili URL''i: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,5 +96,5 @@
 msgstr "Hoiatus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
@@ -102,5 +102,5 @@
 "URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -120,8 +120,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -183,5 +183,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:53
 msgid "Plugins"
-msgstr "Pistikrakendused"
+msgstr "Lisand programmid"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
@@ -229,5 +229,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -279,4 +279,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -332,4 +333,13 @@
 msgstr "Lisa sõlm laiuskraadi ja pikkuskraadi järgi."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -343,8 +353,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -400,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -454,5 +464,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -463,7 +473,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -481,7 +492,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -549,28 +560,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Ei ole valitud midagi, millele suumida"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Suumi {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Suumi vaade {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Vaade: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Ei ole vastuolusid, millele suumida"
@@ -661,5 +672,5 @@
 msgstr "Ühenda {0} teed."
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Palun vali vähemalt kaks teed, mida sobitada."
@@ -709,5 +720,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -798,5 +809,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86
 msgid "Object type:"
-msgstr ""
+msgstr "Objekti tüüp:"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
@@ -807,5 +818,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93
 msgid "Object ID:"
-msgstr ""
+msgstr "Objekti ID:"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:64
@@ -818,5 +829,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr ""
@@ -861,5 +872,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -978,5 +989,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Kas sa tõesti soovid jätkata?"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -988,25 +999,25 @@
 msgstr "Lõikumist ei leitud. Mitte midagi ei muudetud."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Sõlm lisatud kõikidesse lõikumiskohtadesse."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Kustutada teed, mis pole sisemise multihulknurga osad"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Paranda relatsioonid"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Ühendatud iseenesega kattuv ala"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Kattuvate alade ühendamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1016,33 +1027,33 @@
 "tekitatud vigu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Sisesta kõigi vastuolude kohta väärtused."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Lahenda vastuolud."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Paranda sildikonfliktid"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Element relatsioonidest eemaldatud"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Alade ühendamine: Eemalda lühikesed teed"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Suletud tee"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Eemalda sildid sisemistelt teedelt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Alade ühendamise funktsioon"
@@ -1061,5 +1072,5 @@
 msgstr "Ühenda sõlm ja joon."
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Ei ole shortcuti."
@@ -1502,8 +1513,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1513,5 +1524,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1924,20 +1935,27 @@
 msgstr "Tühista eelmine tegevus"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Tühista kõik valikud"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Tühista kõigi objektide valikud"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Tühista kõik valikud (fookus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Tühista kõik valikud (page)"
@@ -2056,16 +2074,12 @@
 msgstr "Lülita joonvõrgu vaade"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Suumi sisse"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Suumi välja"
@@ -2275,9 +2289,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2292,52 +2306,52 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Joonistamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Sõlmede joonistamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Sõlme ei saa lisada maailmast väljapoole."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Lisa punkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Lisa teele sõlm"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Ühenda olemasolev tee sõlmega"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Ühenda uus sõlm olemasoleva teega"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Lisa sõlm teele ja ühenda"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Loo uus sõlm."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Vali kursori all olev sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2346,14 +2360,14 @@
 msgstr[1] "Lisa {0} teele uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Alusta uut teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Jätke teed viimasest sõlmest."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Lõpeta joonistamine."
@@ -2871,5 +2885,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3734,5 +3748,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "valitud"
@@ -3763,5 +3777,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "taust"
@@ -3845,9 +3859,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3945,6 +3959,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4062,38 +4076,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Üleslaadimise valikud"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Lae käesolikud valikud serverisse"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "tekst"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Kasutajanimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM salasõna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Muuda apleti suurus antud mõõtu (formaat: LAIUSxKÕRGUS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "tekst;tekst;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4103,5 +4117,5 @@
 "lat=y&lon=x&zoom=z või failinime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4111,5 +4125,5 @@
 "lat=y&lon=x&zoom=z või failinime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4119,87 +4133,87 @@
 "mis tagastab osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "iga"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Kui määratud, lähtestab konfiguratsiooni selle lugemise asemel."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Salasõna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4209,9 +4223,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4219,37 +4233,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
-msgstr "Varaste pistikrakendustel laadimine"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+msgstr "Varaste lIsandprogrammidl laadimine"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Loon kasutajaliidest"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
-msgstr "Pistikrakenduste laadimine"
-
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+msgstr "LIsandprogrammide  laadimine"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4262,5 +4276,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4384,10 +4398,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "kiht ei ole nimekirjas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4800,5 +4814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5286,6 +5300,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5296,5 +5310,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5571,5 +5585,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5644,5 +5658,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Lae uuesti"
@@ -5698,9 +5712,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Liiguta valitud kiht ühe rea võrra üles."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Liiguta valitud kiht ühe rea võrra alla."
@@ -6827,8 +6841,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7446,55 +7460,55 @@
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Muuda seost"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+msgid "Delete from relation"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8121,5 +8135,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8151,21 +8165,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer exception, arvatavasti mõned puuduvad sildid (tag)."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8187,5 +8201,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8199,5 +8213,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8233,14 +8247,14 @@
 msgstr "Pildi numbrid"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8254,5 +8268,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8540,5 +8554,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9274,7 +9288,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9431,4 +9448,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr ""
@@ -9597,5 +9615,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9657,18 +9675,18 @@
 msgstr "Andmekiht {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9677,5 +9695,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9689,5 +9707,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9700,11 +9718,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9713,32 +9731,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9784,8 +9802,4 @@
 msgstr[1] "{0} punkti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10060,5 +10074,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
@@ -10083,5 +10097,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10113,55 +10127,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10170,5 +10184,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10233,7 +10247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Näita/Peida Tekst/Ikoonid"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11043,35 +11056,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Värv"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Vali"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Värvid"
@@ -11514,17 +11527,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11532,5 +11545,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11541,5 +11554,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11556,9 +11569,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11569,5 +11582,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11576,66 +11589,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr ""
@@ -11686,5 +11699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:53
 msgid "Configure available plugins."
-msgstr "Saadaolevate pistikrakenduste konfigureerimine."
+msgstr "Saadaolevate lIsandprogrammide konfigureerimine."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:119
@@ -11696,21 +11709,21 @@
 msgstr "Muudatuste rakendumiseks pead JOSMi taaskäivitama."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projektsiooni meetodid"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11755,10 +11768,9 @@
 msgstr ""
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr ""
@@ -12232,24 +12244,23 @@
 msgstr "Tundmatu tüüp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Viga sõelumisel {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente tüübist {0} toetatakse."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12259,17 +12270,17 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Muuda seadeid"
@@ -12778,11 +12789,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13419,5 +13423,5 @@
 #, java-format
 msgid "An error occurred in plugin {0}"
-msgstr "Pistikus {0} tekkis viga"
+msgstr "LIsandprogrammis {0} tekkis viga"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
@@ -14054,5 +14058,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14065,5 +14069,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14073,5 +14077,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14082,5 +14086,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Vihje: Kiirkorraldusi saad muuta seadete alt..)"
@@ -14450,15 +14454,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14477,18 +14481,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14655,7 +14659,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Vali sihtkiht"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15214,7 +15217,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Riiklikud"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16674,32 +16676,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Taasta"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Objekti ajalugu"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Elemendi ajalugu."
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Valmistan ette OSM andmeid..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Sule avatud muutustekogumid"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Muudetud sellest: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Ettevalmistus..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Muutustekogum {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -16935,5 +16938,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17010,16 +17012,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -17865,57 +17867,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Tühista kõigi objektide valikud"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Uuenda objektid"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Vali, kas andmed tuleb alla laadida uude kihti"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Sisesta alla laetava objekti ID"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Uuenda objektid"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Uuenda objektid"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Alusta allalaadimist"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Sule dialoogiaken ja katkesta allalaadimine"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Fail: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Suumi {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Leitud {0} vastet"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18658,4 +18652,14 @@
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Video"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19064,4 +19068,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "Alla"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19247,7 +19257,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Sule avatud muutustekogumid"
+msgstr ""
 
 #. Plugin routes
@@ -19319,6 +19328,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19327,15 +19344,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19344,5 +19361,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -31888,7 +31905,4 @@
 #~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n"
 
-#~ msgid "Preparing..."
-#~ msgstr "Ettevalmistus..."
-
 #~ msgid "Uploading..."
 #~ msgstr "Üleslaadimine..."
@@ -31954,7 +31968,4 @@
 #~ msgid "There were conflicts during import."
 #~ msgstr "Importimisel tekkisid konfliktid."
-
-#~ msgid "Revert"
-#~ msgstr "Taasta"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 21299)
+++ applications/editors/josm/i18n/po/fi.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-08 23:01+0000\n"
-"Last-Translator: Mika Laari <laari@iki.fi>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-13 18:54+0000\n"
+"Last-Translator: Teemu Koskinen <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Ohje"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Hylätään virheellinen tiedosto-URL: ”{0}”"
-
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+msgstr "Ohitetaan virheellinen tiedosto-URL: ”{0}”"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,12 +96,12 @@
 msgstr "Varoitus"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametrin ”downloadgps” arvoksi ei kelpaa tiedoston URL eikä nimi."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Jätetään huomioimatta virheellinen URL-osoite: ”{0}”"
+msgstr "Ohitetaan virheellinen URL-osoite: ”{0}”"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -231,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -248,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -269,5 +269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -281,4 +281,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -336,4 +337,13 @@
 msgstr "Lisää piste syöttämällä leveyspiiri ja pituuspiiri."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -347,8 +357,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -404,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -458,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -467,7 +477,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -485,7 +496,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -553,28 +564,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Ei mitään valittuna"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Sovita näkymä {0}:aan."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Sovita {0} näkymään."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Näytä: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Ei ristiriitoja"
@@ -587,5 +598,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37
 msgid "Toggle visibility of Changeset Manager window"
-msgstr ""
+msgstr "Muutoskokoelmien hallintaikkunan näkyvyys"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
@@ -665,5 +676,5 @@
 msgstr "Yhdistä {0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
@@ -713,5 +724,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -784,18 +795,18 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77
 msgid "Separate Layer"
-msgstr "Erota taso"
+msgstr "Uusi taso"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
 msgid "Select if the data should be downloaded into a new layer"
-msgstr "Valitse jos tiedot pitäisi ladata uudelle tasolle"
+msgstr "Valitse, ladataanko data uudelle tasolle"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46
 msgid "Download referrers"
-msgstr ""
+msgstr "Lataa viitekohteet"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
 msgid "Select if the referrers of the object should be downloaded as well"
-msgstr ""
+msgstr "Valitse, ladataanko myös objektiin viittaavat kohteet"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
@@ -806,14 +817,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Valitse objektin tyyppi"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93
 msgid "Object ID:"
-msgstr "Objektin ID:"
+msgstr "Objektin tunniste:"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:64
 msgid "Enter the ID of the object that should be downloaded"
-msgstr "Anna ladattavan objektin ID"
+msgstr "Anna ladattavan objektin tunniste"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77
@@ -822,5 +833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Lataa objekti"
@@ -828,19 +839,19 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:83
 msgid "Start downloading"
-msgstr "Aloita lataus"
+msgstr "Aloittaa latauksen"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
 msgid "Close dialog and cancel downloading"
-msgstr "Sulje ikkuna ja peruuta lataus"
+msgstr "Sulkee ikkunan ja peruuuttaa latauksen"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
 msgid "Download parent ways/relations..."
-msgstr "Lataa polut/relaatiot joihin tämä kuuluu..."
+msgstr "Lataa emopolut ja -relaatiot..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
 msgid "Download primitives referring to one of the selected primitives"
-msgstr "Lataa kaikki valittuihin alkioihin viittaavat alkiot."
+msgstr "Lataa kaikki objektit, jotka viittaavat valittuihin objekteihin."
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
@@ -854,5 +865,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
 msgid "Duplicate selection by copy and immediate paste."
-msgstr "Monista valinta kopioimalla ja liittämällä samantien."
+msgstr "Monistaa valinnan tekemällä peräkkäin toiminnot kopioi ja liitä."
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
@@ -862,8 +873,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
 msgid "Make a duplicate of the currently selected layer."
-msgstr "Tee kopio valitusta tasosta."
+msgstr "Tekee kopion valitusta tasosta."
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -931,14 +942,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
-msgstr "Objektin historia"
+msgstr "Kohteen historia"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Näytä historiatietoja OSM-poluista, -pisteistä ja -relaatioista."
+msgstr "Näytä historiatietoja OSM-pisteistä, -poluista tai -relaatioista."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
 msgid "Info about Element"
-msgstr "Tietoa elementistä"
+msgstr "Tietoja kohteesta"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
@@ -952,13 +963,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
 msgid "Joins areas that overlap each other"
-msgstr "Yhdistää alueet jotka ovat osittain toistensa päällä"
+msgstr "Yhdistää alueet, jotka ovat osittain toistensa päällä"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
-msgstr ""
+msgstr "Valitse yhdistettäväksi ainakin yksi suljettu polku"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
 msgid "Only up to two areas can be joined at the moment."
-msgstr "Vain kaksi aluetta voidaan yhdistää tällä hetkellä."
+msgstr "Korkeintaan kaksi aluetta voidaan yhdistää tällä hetkellä."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:139
@@ -990,27 +1001,27 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
 msgid "No intersection found. Nothing was changed."
-msgstr "Leikkauspisteitä ei löytynyt. Mitään ei muutettu."
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+msgstr "Leikkauspisteitä ei löytynyt, joten mitään ei muutettu."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
-msgstr "Lisättiin piste kaikkiin leikkauskohtiin"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+msgstr "Lisää piste kaikkiin leikkauskohtiin"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+msgstr "Poista polut, jotka eivät ole monimonikulmion sisämonikulmioita"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Korjaa relaatiot"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
-msgstr "Yhdistettiin itsensä kanssa päälekkäinen alue"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+msgstr "Yhdistettiin itsensä kanssa päällekkäinen alue"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
-msgstr "Yhdistä osittain päälekkäiset alueet"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+msgstr "Yhdistettiin osittain päällekkäiset alueet"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1020,33 +1031,33 @@
 "syntynyt virheitä."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Syötä arvot kaikille ristiriidoille."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
-msgstr "Ratkaise ristiriitoja"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+msgstr "Ratkaise ristiriidat"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Korjaa tagikonflikteja"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
-msgstr "Objekti poistettiin relaatioista"
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+msgstr "Kohde poistettiin relaatioista"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+msgstr "Alueiden yhdistus: Lyhyiden polkujen poisto"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Suljettu polku"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+msgstr "Poista tagit inner-poluilta"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Yhdistä alueet -tominto"
@@ -1065,5 +1076,5 @@
 msgstr "Yhdistä piste ja polku."
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Ei pikanäppäintä"
@@ -1096,9 +1107,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 msgid "Jump there"
-msgstr ""
+msgstr "Siirry"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104
 msgid "Jump to Position"
-msgstr ""
+msgstr "Siirry sijaintiin"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
@@ -1159,5 +1170,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Yhdistä valitut alkiot toiselle tasolle"
+msgstr "Yhdistä valitut objektit toiselle tasolle"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
@@ -1367,5 +1378,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
 msgid "Undo Orthogonalize Shape"
-msgstr ""
+msgstr "Peruuta muodon suorakulmaistus"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:120
@@ -1438,6 +1449,6 @@
 "incomplete primitives?"
 msgstr ""
-"Kopioitu data sisältää keskeneräisiä alkioita. Liitettäessä keskeneräiset "
-"alkiot poistetaan. Liitetäänkö data ilman keskeneräisiä alkioita?"
+"Kopioitu data sisältää keskeneräisiä objekteja. Liitettäessä keskeneräiset "
+"objektit poistetaan. Liitetäänkö data ilman keskeneräisiä objekteja?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1448,5 +1459,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr "Liitä valituille kohteille avain/arvo-parit leikepöydältä."
+msgstr "Liitä valituille kohteille tagit leikepöydältä."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
@@ -1527,8 +1538,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1538,5 +1549,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1954,22 +1965,29 @@
 msgstr "Peru viimeisin toiminto."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
-msgstr "Poista valinta"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+msgstr "Tyhjennä valinta"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
-msgstr "Poista valinta kaikista objekteista."
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+msgstr "Poista valinta kaikista kohteista."
+
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
-msgstr "Poista valinnat  (fokus)"
-
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+msgstr "Tyhjennä valinta (fokus)"
+
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
-msgstr "Poista valinnat (escape)"
+msgstr "Tyhjennä valinta (escape)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
@@ -1980,5 +1998,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
 msgid "Updates the objects in the active data layer from the server."
-msgstr "Päivittää aktiivisen datatason objektit palvelimelta."
+msgstr "Päivittää aktiivisen datatason kohteet palvelimelta."
 
 #. bounds defined? => use the bbox downloader
@@ -1992,42 +2010,42 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:28
 msgid "Update modified"
-msgstr "Päivitä muokatut objektit"
+msgstr "Päivitä muokatut kohteet"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:26
 msgid ""
 "Updates the currently modified objects from the server (re-downloads data)"
-msgstr "Päivittää muokatut objektit palvelimelta"
+msgstr "Päivittää muokatut kohteet palvelimelta (lataa datan uudelleen)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
 msgid "No current dataset found"
-msgstr ""
+msgstr "Aktiivista datatasoa ei löytynyt"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
 #, java-format
 msgid "Did not find an object with id {0} in the current dataset"
-msgstr ""
+msgstr "Aktiivisessa datatasossa ei ole kohdetta, jonka tunniste olisi {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
 msgid "Update selection"
-msgstr "Päivitä valitut objektit"
+msgstr "Päivitä valitut kohteet"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
-msgstr "Päivittää valitut objektit palvelimelta (uudelleenlataa tiedot)"
+msgstr "Päivittää valitut kohteet palvelimelta (lataa datan uudelleen)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
 msgid "There are no selected objects to update."
-msgstr "Objekteja ei ole valittuna päivitettäväksi"
+msgstr "Kohteita ei ole valittuna päivitettäväksi"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
 msgid "Selection empty"
-msgstr "Valinta tyhjä"
+msgstr "Valinta on tyhjä"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
 msgid "Upload data"
-msgstr "Lähetä tietoa"
+msgstr "Lähetä data"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
@@ -2041,5 +2059,5 @@
 "''{0}''.<br>You have to resolve them first.</html>"
 msgstr ""
-"<html>Ei voida lähettää tietoja, joissa on selvittämättömiä ristiriitoja "
+"<html>Ei voida lähettää dataa, jossa on selvittämättömiä ristiriitoja "
 "(tasolla \"{0}\").<br>Selvitä ensin ristiriidat.</html>"
 
@@ -2060,18 +2078,18 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr "Lähetä kaikki valittujen objektion muutokset OSM-palvelimelle"
+msgstr "Lähetä kaikkien valittujen kohteiden muutokset OSM-palvelimelle"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:257
 msgid "Checking parents for deleted objects"
-msgstr ""
+msgstr "Tarkistetaan poistettujen kohteiden emokohteita"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:316
 #, java-format
 msgid "Reading parents of ''{0}''"
-msgstr ""
+msgstr "Luetaan kohteen ''{0}'' emokohteita"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:322
 msgid "Checking for deleted parents in the local dataset"
-msgstr ""
+msgstr "Etsitään poistettuja emokohteita paikallisesta datajoukosta"
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23
@@ -2088,16 +2106,12 @@
 msgstr "Vaihda rautalankanäkymän päälläoloa"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Lähennä"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Loitonna"
@@ -2207,4 +2221,5 @@
 "Ignoring exception because download has been cancelled. Exception was: {0}"
 msgstr ""
+"Jätetään poikkeus huomioimatta koska lataus keskeytettiin. Poikkeus oli: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:142
@@ -2249,13 +2264,13 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
-"<html>Paikallisessa datajoukossa on {0} alkiota, jotka on<br>mahdollisesti "
+"<html>Paikallisessa datajoukossa on {0} objektia, jotka on<br>mahdollisesti "
 "poistettu palvelimelta. Jos yrität myöhemmin<br>poistaa tai päivittää ne, "
 "ilmoittaa palvelin todennäköisesti<br>ristiriidasta.<br><br>Voit tarkistaa "
-"alkioiden tilan palvelimelta<br>painamalla <strong>{1}</strong>.<br>Ohita "
+"objektien tilan palvelimelta<br>painamalla <strong>{1}</strong>.<br>Ohita "
 "painamalla <strong>{2}</strong>.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
 msgid "Deleted or moved primitives"
-msgstr "Poistetut tai siirretyt alkiot"
+msgstr "Poistetut tai siirretyt objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:239
@@ -2267,5 +2282,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
 msgid "Errors during Download"
-msgstr ""
+msgstr "Virheitä latauksen aikana"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
@@ -2301,5 +2316,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
 msgid "Errors during download"
-msgstr "Virheitä tiedon lataamisessa"
+msgstr "Virheitä latauksen aikana"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
@@ -2312,9 +2327,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2332,52 +2347,52 @@
 "käyttävät polut."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Piirrä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Piirrä pisteitä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Maailman ulkopuolelle ei voi lisätä pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Lisää piste"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Lisää piste polkuun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Yhdistä olemassa oleva polku pisteeseen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Lisää uusi piste olemassa olevaan polkuun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Lisää piste polkuun ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Luo uusi piste."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Valitse kursorin alla oleva piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2386,14 +2401,14 @@
 msgstr[1] "Lisää uusi piste {0} polkuun."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Aloita uusi polku viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Jatka polkua viimeisestä pisteestä."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Lopeta piirtäminen."
@@ -2575,5 +2590,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "Kirjoita suodatuslauseke."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
@@ -2701,6 +2716,6 @@
 "max)"
 msgstr ""
-"<b>tags:</b>... - kohde, jossa on annettu määrä tageja (tags:määrä tai tags:"
-"min-max)"
+"<b>tags:</b>... - objekti, jossa on annettu määrä tageja (tags:määrä tai "
+"tags:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
@@ -2850,5 +2865,6 @@
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr "Tuntematon alkiotyyppi: {0}. Sallitut arvot ovat node, way ja relation"
+msgstr ""
+"Tuntematon objektin tyyppi: {0}. Sallitut arvot ovat node, way ja relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
@@ -2872,5 +2888,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
 msgid "Primitive id expected"
-msgstr "Odotettavissa alkion id"
+msgstr "Olisi pitänyt olla objektin tunniste"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
@@ -2957,5 +2973,5 @@
 msgstr "Lisää relaatio {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3035,5 +3051,5 @@
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>Taso ''{0}'' sisältää jo ristiriidan alkiolle<br>''{1}''.<br>Tätä "
+"<html>Taso ''{0}'' sisältää jo ristiriidan objektille<br>''{1}''.<br>Tätä "
 "ristiriitaa ei voi lisätä.</html>"
 
@@ -3049,6 +3065,6 @@
 "primitive ''{1}''."
 msgstr ""
-"Varoitus: Tasoa \"{0}\" ei ole enää olemassa. Alkion \"{1}\" ristiriitaa ei "
-"voi poistaa."
+"Varoitus: Tasoa \"{0}\" ei ole enää olemassa. Objektin \"{1}\" ristiriitaa "
+"ei voi poistaa."
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -3212,15 +3228,15 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr ""
+msgstr "Selvitä {0} pisteen {1} tagikonfliktia"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
 #, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr ""
+msgstr "Selvitä {0} polun {1} tagikonfliktia"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr "Selvitetään {0} tagiristiriitaa relaatiossa {1}"
+msgstr "Selvitä {0} relaation {1} tagikonfliktia"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
@@ -3228,6 +3244,6 @@
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Palauta {0} alkio"
-msgstr[1] "Palauta {0} alkiota"
+msgstr[0] "Palauta {0} objekti"
+msgstr[1] "Palauta {0} objektia"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -3472,5 +3488,5 @@
 #, java-format
 msgid "Already registered a conflict for primitive ''{0}''."
-msgstr "Alkiolle \"{0}\" on jo rekisteröity ristiriita"
+msgstr "Objektille \"{0}\" on jo rekisteröity ristiriita"
 
 #. *
@@ -3523,5 +3539,5 @@
 msgid ""
 "Unable to add primitive {0} to the dataset because it is already included"
-msgstr "Alkiota {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
+msgstr "Objektia {0} ei voi lisätä datajoukkoon, koska se kuuluu jo siihen"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
@@ -3532,5 +3548,5 @@
 "error, it should be safe to continue in your work."
 msgstr ""
-"Alkiota [{0} {1}] ei löytynyt datajoukosta, vaikka sen oletettiin olevan "
+"Objektia [{0} {1}] ei löytynyt datajoukosta, vaikka sen oletettiin olevan "
 "siellä. Voit ilmoittaa virheen sivulla \"http://josm.openstreetmap.de/\". "
 "Tämä ei ole kriittinen virhe, ja työskentelyä pitäisi voida jatkaa "
@@ -3661,5 +3677,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:488
 msgid "A primitive with ID = 0 cannot be invisible."
-msgstr "Alkio, jonka id = 0, ei voi olla näkymätön"
+msgstr "Objekti, jonka tunniste on 0, ei voi olla näkymätön"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:545
@@ -3679,6 +3695,6 @@
 "{0}"
 msgstr ""
-"Uuden alkion muutosjoukon tunnisteen (changesetId) pitää olla 0, mutta "
-"annettu tunniste oli {0}."
+"Uuden objektin muutosjoukon tunnisteen pitää olla 0, mutta annettu tunniste "
+"oli {0}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1139
@@ -3687,5 +3703,5 @@
 "other is not"
 msgstr ""
-"Alkioita ei voi yhdistää, koska jompikumpi niistä on uusi, mutta toinen ei"
+"Objekteja ei voi yhdistää, koska jompikumpi niistä on uusi, mutta toinen ei"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1141
@@ -3694,5 +3710,5 @@
 "Cannot merge primitives with different ids. This id is {0}, the other is {1}"
 msgstr ""
-"Alkioita ei voi yhdistää, koska niillä on eri tunnisteet: tällä {0} ja "
+"Objekteja ei voi yhdistää, koska niillä on eri tunnisteet: tällä {0} ja "
 "toisella {1}"
 
@@ -3736,5 +3752,5 @@
 "multiple values."
 msgstr ""
-"Tagikokoelmaa ei voi asettaa alkiolle, koska siinä on toistuvia avaimia."
+"Tagikokoelmaa ei voi asettaa objektille, koska siinä on toistuvia avaimia."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
@@ -3747,5 +3763,5 @@
 #, java-format
 msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr "Alkion \"{0}\" versiota ei voi verrata alkion \"{1}\" versioon."
+msgstr "Objektin \"{0}\" versiota ei voi verrata alkion \"{1}\" versioon."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
@@ -3842,5 +3858,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "valitut"
@@ -3856,5 +3872,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
 msgid "Node: tagged"
-msgstr ""
+msgstr "Piste: tagattu"
 
 #. teal
@@ -3871,5 +3887,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "tausta"
@@ -3953,9 +3969,9 @@
 msgstr "PUWG-alue"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Puola)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4053,6 +4069,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4170,38 +4186,38 @@
 msgstr "Parametrille {0} odotettiin epätyhjää arvoa, mutta saatiin ”{1}”"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Lähetä asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Lähetä nykyiset asetukset palvelimelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "merkkijono"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Käyttäjän nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM:n salasana."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Muuta sovelman koko annetuksi (muoto: LEVEYSxKORKEUS)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "merkkijono;merkkijono;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4209,5 +4225,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4215,5 +4231,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4221,87 +4237,87 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "mikä tahansa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Jos määritetty, nollaa asetukset niiden lukemisen sijaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Salasana"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "käyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "valinnat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Näytä tämä ohje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Palauta oletusasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Aseta kieli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/polku/josmin/hakemistoon/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4311,9 +4327,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "esimerkkejä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4323,37 +4339,37 @@
 "järjestyksessä."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Alustetaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Päivitetään liitännäisiä..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Asennetaan päivitetyt liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Ladataan aikaisia liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Asetetaan oletuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Luodaan pääikkuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Ladataan liitännäisiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4366,5 +4382,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4488,10 +4504,10 @@
 msgstr "Käyttäjä:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "taso ei ole listassa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4776,10 +4792,10 @@
 "primitive<br>because they are deleted in the target dataset:"
 msgstr ""
-"Seuraavia alkioita ei voitu kopioida lähdejoukosta, koska<br>\r\n"
+"Seuraavia objekteja ei voitu kopioida lähdejoukosta, koska<br>\r\n"
 "ne on poistettu kohteena olevasta datajoukosta:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
 msgid "Merging deleted primitives failed"
-msgstr "Virhe poistettujen alkioiden yhdistämisessä"
+msgstr "Virhe poistettujen objektien yhdistämisessä"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628
@@ -4914,5 +4930,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5046,13 +5062,13 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"Datajoukossa on vielä {0} alkio, johon viitataan<br>palvelimelta poistetusta "
-"relaatiosta {1}.<br>Haluatko palauttaa relaation?"
+"Datajoukossa on vielä {0} objekti, johon viitataan<br>palvelimelta "
+"poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
 msgstr[1] ""
-"Datajoukossa on vielä {0} alkiota, joihin viitataan<br>palvelimelta "
+"Datajoukossa on vielä {0} objektia, joihin viitataan<br>palvelimelta "
 "poistetusta relaatiosta {1}.<br>Haluatko palauttaa relaation?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
 msgid "Undelete dependent primitives?"
-msgstr "Palautetaanko riippuvat alkiot?"
+msgstr "Palautetaanko riippuvaiset objektit?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
@@ -5153,5 +5169,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5160,5 +5176,5 @@
 msgstr ""
 "<html>Jos haluat säilyttää tekemäsi paikallisen version,<br>JOSMin täytyy "
-"asettaa alkion {0} tunniste nollaksi.<br>Seuraavan lähetyksen yhteydessä "
+"asettaa objektin {0} tunniste nollaksi.<br>Seuraavan lähetyksen yhteydessä "
 "palvelin asettaa<br>sille uuden tunnisteen.<br>Toteutetaanko muutos?</html>"
 
@@ -5181,5 +5197,5 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSMin täytyy poistaa tekemäsi paikallinen alkio {0}<br>datajoukosta."
+"<html>JOSMin täytyy poistaa tekemäsi paikallinen objekti {0}<br>datajoukosta."
 "<br>Toteutetaanko muutos?</html>"
 
@@ -5288,5 +5304,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Objekteja yhdistettäessä tapahtui ristiriitoja"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:135
@@ -5409,6 +5425,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5419,5 +5435,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5706,8 +5722,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
 msgid "Filter objects and hide/disable them."
-msgstr "Valitse kohteita suotimilla, ja piilota tai himmennä ne"
+msgstr "Piilota tai himmennä objekteja suotimilla."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5741,5 +5757,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
 msgid "Enable filter"
-msgstr "Suodin käytössä"
+msgstr "Ota suodin käyttöön"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
@@ -5762,5 +5778,5 @@
 #, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr ""
+msgstr "Suodin: {0} piilossa, {1} himmeänä"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -5782,5 +5798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Lataa uudelleen"
@@ -5836,9 +5852,9 @@
 msgstr "Monista tämä taso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Siirrä valittu taso rivi ylöspäin."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
@@ -5987,5 +6003,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:160
 msgid "Select primitives submitted by this user"
-msgstr "Valitse tämän käyttäjän lähettämät alkiot"
+msgstr "Valitse tämän käyttäjän lähettämät objektit"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191
@@ -6197,5 +6213,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
 msgid "Download and show the history of the selected primitives"
-msgstr "Lataa ja näytä valittujen alkioiden historia"
+msgstr "Lataa ja näytä valittujen objektien historia"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
@@ -6206,5 +6222,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
 msgid "Select the corresponding primitives in the current data layer"
-msgstr "Valitse merkityt alkiot aktiiviselta datatasolta"
+msgstr "Valitse merkityt objektit aktiiviselta datatasolta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
@@ -6232,5 +6248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
 msgid "Zoom to the corresponding primitives in the current data layer"
-msgstr "Näytä merkityt alkiot aktiiviselta datatasolta"
+msgstr "Näytä merkityt objektit aktiiviselta datatasolta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
@@ -6968,8 +6984,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7158,5 +7174,5 @@
 "Select the primitives in the content of this changeset in the current data "
 "layer"
-msgstr "Valitse muutoskokoelmaan kuuluvat alkiot aktiiviselta datatasolta"
+msgstr "Valitse muutoskokoelmaan kuuluvat objektit aktiiviselta datatasolta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
@@ -7172,5 +7188,5 @@
 "Zoom to the primitives in the content of this changeset in the current data "
 "layer"
-msgstr "Näytä muutoskokoelmaan kuuluvat alkiot aktiiviselta datatasolta"
+msgstr "Näytä muutoskokoelmaan kuuluvat objektit aktiiviselta datatasolta"
 
 #. parent for dialog is Main.parent
@@ -7568,5 +7584,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
 msgid "Please select the objects you want to change properties for."
-msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata."
+msgstr "Valitse kohteet, joiden ominaisuuksia haluat muokata."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
@@ -7588,55 +7604,55 @@
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Valitse relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Valitse relaatio päävalinnasta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Valitse relaatioluettelosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Valitse relaatio relaatioluettelosta"
@@ -7775,10 +7791,10 @@
 "html>"
 msgstr ""
-"<html>Relaatiossa on jo ainakin yksi jäsen, joka viittaa<br>alkioon "
+"<html>Relaatiossa on jo ainakin yksi jäsen, joka viittaa<br>objektiin "
 "''{0}''<br><br>Lisätäänkö uusi jäsen silti relaatioon?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
 msgid "Multiple members referring to same primitive"
-msgstr "Useat jäsenet viittaavat samaan alkioon"
+msgstr "Useat jäsenet viittaavat samaan objektiin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
@@ -7796,5 +7812,5 @@
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
-"Lisää kaikki nykyisestä datajoukosta valitut alkiot ensimmäisen jäsenen "
+"Lisää kaikki nykyisestä datajoukosta valitut objektit ensimmäisen jäsenen "
 "edelle"
 
@@ -7803,5 +7819,6 @@
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
-"Lisää kaikki nykyisestä datajoukosta valitut alkiot viimeisen jäsenen perään"
+"Lisää kaikki nykyisestä datajoukosta valitut objektit viimeisen jäsenen "
+"perään"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
@@ -7810,5 +7827,5 @@
 "member"
 msgstr ""
-"Lisää kaikki nykyisestä datajoukosta valitut alkiot ensimmäisen valitun "
+"Lisää kaikki nykyisestä datajoukosta valitut objektit ensimmäisen valitun "
 "jäsenen edelle"
 
@@ -7818,10 +7835,10 @@
 "member"
 msgstr ""
-"Lisää kaikki nykyisestä datajoukosta valitut alkiot viimeisen valitun "
+"Lisää kaikki nykyisestä datajoukosta valitut objektit viimeisen valitun "
 "jäsenen perään"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
 msgid "Remove all members referring to one of the selected primitives"
-msgstr "Poista kaikki jäsenet, jotka viittaavat valittuihin alkioihin"
+msgstr "Poista kaikki jäsenet, jotka viittaavat valittuihin objekteihin"
 
 #. putValue(NAME, tr("Remove Selected"));
@@ -7836,5 +7853,5 @@
 msgstr ""
 "Valitse ne relaatiojäsenet, jotka viittaavat nykyisessä valinnassa oleviin "
-"alkioihin"
+"objekteihin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
@@ -7845,9 +7862,9 @@
 msgstr ""
 "Valitse relaatiojäsenet, jotka viittaavat {0} nykyisessä valinnassa olevaan "
-"alkioon"
+"objektiin"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
 msgid "Select primitives for selected relation members"
-msgstr "Valitse alkiot, joihin valitut relaatiojäsenet viittaavat"
+msgstr "Valitse objektit, joihin valitut relaatiojäsenet viittaavat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880
@@ -7950,5 +7967,5 @@
 "<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
-"<html>Alkiolla <br>''{1}''<br>on jo ristiriita tasolla ''{0}''.<br>Selvitä "
+"<html>Objektilla <br>''{1}''<br>on jo ristiriita tasolla ''{0}''.<br>Selvitä "
 "ensin aiempi ristiriita, ja yritä sitten uudelleen.</html>"
 
@@ -8002,10 +8019,10 @@
 msgid "You are setting an empty role on {0} primitive."
 msgid_plural "You are setting an empty role on {0} primitives."
-msgstr[0] "Olet antamassa tyhjän roolin {0} alkiolle."
-msgstr[1] "Olet antamassa tyhjän roolin {0} alkiolle."
+msgstr[0] "Olet antamassa tyhjän roolin {0} objektille."
+msgstr[1] "Olet antamassa tyhjän roolin {0} objektille."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315
 msgid "This is equal to deleting the roles of these primitives."
-msgstr "Se vastaa roolin poistamista näiltä alkioilta."
+msgstr "Se vastaa roolin poistamista näiltä objekteilta."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
@@ -8292,5 +8309,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8322,21 +8339,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8358,5 +8375,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8370,5 +8387,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8404,14 +8421,14 @@
 msgstr "Karttaruutujen numerot"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8425,5 +8442,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8528,5 +8545,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr "Historiaa ei ole vielä alustettu. Verrokkialkiota ei voitu asettaa."
+msgstr "Historiaa ei ole vielä alustettu. Verrokkiobjektia ei voitu asettaa."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8545,5 +8562,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
 msgid "History not initialized yet. Failed to set current primitive."
-msgstr "Historiaa ei ole vielä alustettu. Nykyistä alkiota ei voitu asettaa."
+msgstr "Historiaa ei ole vielä alustettu. Nykyistä objektia ei voitu asettaa."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
@@ -8553,5 +8570,5 @@
 "history."
 msgstr ""
-"Nykyistä alkiota ei voitu asettaa. Historiatiedoissa ei ole versiota {0}."
+"Nykyistä objektia ei voitu asettaa. Historiatiedoissa ei ole versiota {0}."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
@@ -8670,6 +8687,6 @@
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
-"Alkiota {0} ei voitu lähettää palvelimelle, koska aktiivista tasoa ei ole "
-"asetettu."
+"Objektia {0} ei voitu lähettää palvelimelle, koska aktiivista tasoa ei ole "
+"asetettu"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
@@ -8679,5 +8696,5 @@
 "include such a primitive"
 msgstr ""
-"Alkiota {0} ei voitu lähettää palvelimelle, koska sitä ei ole aktiivisella "
+"Objektia {0} ei voitu lähettää palvelimelle, koska sitä ei ole aktiivisella "
 "tasolla."
 
@@ -8714,8 +8731,8 @@
 msgstr ""
 "<html>Tietojen lähetys <strong>epäonnistui</strong>, koska palvelimella on "
-"uudempi versio<br>muokkaamastasi solmusta, polusta tai relaatiosta."
+"uudempi versio<br>muokkaamastasi pisteestä, polusta tai relaatiosta."
 "<br>Ristiriidan aiheutti <strong>{0}</strong> ({1}): palvelimen versio on "
 "{2}, sinun versiosi on {3}.<br><br>Paina <strong>{4}</strong>, jos haluat "
-"päivittää ainoastaan ristiriitaisen alkion.<br>Paina <strong>{5}</strong>, "
+"päivittää ainoastaan ristiriitaisen objektin.<br>Paina <strong>{5}</strong>, "
 "jos haluat päivittää koko paikallisen datajoukon palvelimelta.<br>Paina "
 "<strong>{6}</strong>, jos haluat perua lähetyksen ja jatkaa muokkausta.<br></"
@@ -8724,5 +8741,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Ristiriitoja"
@@ -9332,10 +9349,10 @@
 "primitive and retrying to upload."
 msgstr ""
-"Varoitus: alkio \"{0}\" on jo poistettu palvelimelta. Se ohitetaan, ja "
+"Varoitus: objekti \"{0}\" on jo poistettu palvelimelta. Se ohitetaan, ja "
 "koetetaan jatkaa lähetystä."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
 msgid "Preparing primitives to upload ..."
-msgstr "Kootaan lähetettävät alkiot..."
+msgstr "Valmistellaan lähetettävät objektit..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
@@ -9495,7 +9512,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Lähetetään {0} objektia..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9656,4 +9676,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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-piste"
@@ -9822,5 +9843,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9882,18 +9903,18 @@
 msgstr "Datataso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9902,5 +9923,5 @@
 msgstr[1] "Havaittiin {0} ristiriitaa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9918,5 +9939,5 @@
 "poistamalla<br>{0} kohdetta, jotka on jo poistettu palvelimelta."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9933,11 +9954,11 @@
 "ristiriidoista ja käsittele ne."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9946,32 +9967,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} koostuu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Muuta GPX-tasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -10019,8 +10040,4 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10300,5 +10317,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
@@ -10323,5 +10340,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10353,55 +10370,55 @@
 msgstr "Virhe tiedostossa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Poista kuva tasosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Seuraava"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Keskitä näkymä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10412,5 +10429,5 @@
 "Korkeus: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10477,7 +10494,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Näytä/piilota teksti/kuvakkeet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11287,35 +11303,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Piirtotyyli {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Valitse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Valitse väri {0}:lle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Eri objekteille käytetyt värit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Värit"
@@ -11766,17 +11782,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "pois käytöstä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "ei muuttujaa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Pikanäppäimet</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11784,5 +11800,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11793,5 +11809,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11808,9 +11824,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Muuttujaryhmät</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11821,5 +11837,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11828,66 +11844,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Lue ensin"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Käytä oletusarvoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Avain:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Huomio: Käytä vain oikeita näppäimistön näppäimiä!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Pikanäppäimet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Muokkaa pikanäppäimiä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Ensisijainen muuttuja:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Toissijainen muuttuja:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Valikkopikanäppäimet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Muuttujaryhmät"
@@ -11950,21 +11966,21 @@
 "käyttöön."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Näytä koordinaatit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projektiometodi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Karttaprojektio"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12009,10 +12025,9 @@
 msgstr "Muutetaan pikanäppäimiä käsin."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Pikanäppäin"
@@ -12285,9 +12300,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
-msgstr ""
+msgstr "OSM-käyttäjänimi:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
 msgid "OSM password:"
-msgstr ""
+msgstr "OSM-salasana:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
@@ -12340,5 +12355,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
 msgid "Save to preferences"
-msgstr ""
+msgstr "Tallenna asetuksiin"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:307
@@ -12364,8 +12379,9 @@
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
 msgstr ""
+"<html>Käytä OSM-pavelimen oletusosoitetta (<strong>{0}</strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
 msgid "OSM Server URL:"
-msgstr ""
+msgstr "OSM-palvelimen osoite:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
@@ -12375,5 +12391,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:153
 msgid "Test the API URL"
-msgstr ""
+msgstr "Testaa API:n osoitetta"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:169
@@ -12400,5 +12416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:179
 msgid "Host:"
-msgstr ""
+msgstr "Palvelin:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:114
@@ -12406,5 +12422,5 @@
 msgctxt "server"
 msgid "Port:"
-msgstr ""
+msgstr "Portti:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:126
@@ -12412,12 +12428,14 @@
 "Please enter a username and a password if your proxy requires authentication."
 msgstr ""
+"Ole hyvä ja syötä käytäjänimi ja salasana jos välityspalvelimesi vaatii "
+"autentikoitumista."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
 msgid "Password:"
-msgstr ""
+msgstr "Salasana:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
 msgid "No proxy"
-msgstr ""
+msgstr "Ei välityspalvelinta"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:242
@@ -12437,5 +12455,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:274
 msgid "Use a SOCKS proxy"
-msgstr ""
+msgstr "Käytä SOCKS-välityspalvelinta"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:316
@@ -12491,24 +12509,23 @@
 msgstr "Tuntematon tyyppi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Virhe käsiteltäessä {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12518,17 +12535,17 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Valinta ei ole sopiva!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Muuta ominaisuuksia"
@@ -12881,5 +12898,5 @@
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"Paikallisessa datajoukossa ei ole alkiota {0}. Alkion tyyppiä ei voi "
+"Paikallisessa datajoukossa ei ole objektia {0}. Objektin tyyppiä ei voi "
 "päätellä."
 
@@ -12911,5 +12928,5 @@
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr "Palvelin palautti virhekoodin 404 alkiolle {0}. Ohitetaan."
+msgstr "Palvelin palautti virhekoodin 404 objektin {0}. Ohitetaan."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410
@@ -12933,6 +12950,6 @@
 "for each primitive."
 msgstr ""
-"Palvelimelta saatiin virhekoodi 404, joten yritetään lähettää kaikki alkiot "
-"yksitellen."
+"Palvelimelta saatiin virhekoodi 404, joten yritetään lähettää kaikki "
+"objektit yksitellen."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:449
@@ -13008,5 +13025,5 @@
 "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
-"Alkion \"{0}\" uuden version muoto poikkeaa odotetusta. Saatiin \"{1}\"."
+"Objektin \"{0}\" uuden version muoto poikkeaa odotetusta. Saatiin \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
@@ -13047,11 +13064,4 @@
 msgstr "Valmistellaan lähetystä..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
-
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
 msgid "Waiting 10 seconds ... "
@@ -13105,5 +13115,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:30
 msgid "Invalid bz2 file."
-msgstr ""
+msgstr "Virheellinen Bzip2-tiedosto"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75
@@ -13170,5 +13180,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
 msgid "<anonymous>"
-msgstr ""
+msgstr "<tuntematon>"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:202
@@ -13398,5 +13408,5 @@
 "{1}."
 msgstr ""
-"OSM-alkion {0} \"version\"-attribuutin arvo on virheellinen. Saatiin {1}."
+"OSM-objektin {0} \"version\"-attribuutin arvo on virheellinen. Saatiin {1}."
 
 #. default version in 0.5 files for existing primitives
@@ -13426,5 +13436,5 @@
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
-msgstr "OSM-alkiolta {0} puuttuu \"version\"-attribuutti."
+msgstr "OSM-objektilta {0} puuttuu \"version\"-attribuutti."
 
 #. for a new primitive we just log a warning
@@ -13488,6 +13498,6 @@
 "external id ''{1}''."
 msgstr ""
-"Relaatio, jonka ulkoinen id on \"{0}\", viittaa puuttuvaan alkioon, jonka "
-"ulkoinen id on \"{1}\"."
+"Relaatio, jonka ulkoinen tunniste on \"{0}\", viittaa puuttuvaan objktiin, "
+"jonka ulkoinen tunniste on \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
@@ -13605,5 +13615,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 msgid "Starting to upload with one request per primitive ..."
-msgstr "Aloitaan lähetys yksi alkio kerrallaan ..."
+msgstr "Aloitaan lähetys yksi objekti kerrallaan ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
@@ -13648,5 +13658,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:218
 msgid "Unexpected id 0 for osm primitive found"
-msgstr "Havaittiin OSM-alkiolle odottamaton tunniste \"0\"."
+msgstr "Havaittiin OSM-objektille odottamaton tunniste \"0\"."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
@@ -13954,4 +13964,6 @@
 "change it later)"
 msgstr ""
+"Älä kysy uudestaan ja muista valintani (voit myöhemmin muuttaa valintaa "
+"asetuksista)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:81
@@ -13962,5 +13974,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:225
 msgid "More info..."
-msgstr ""
+msgstr "Lisää tietoa..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42
@@ -13983,5 +13995,5 @@
 #, java-format
 msgid "Processing file ''{0}''"
-msgstr ""
+msgstr "Käsitellään tiedostoa \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
@@ -13998,5 +14010,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:72
 msgid "Download plugin list..."
-msgstr ""
+msgstr "Ladataan listaa liitännäisistä..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:133
@@ -14350,5 +14362,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14361,5 +14373,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14369,5 +14381,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14378,5 +14390,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Vihje: Voit muokata pikanäppäimiä asetuksista.)"
@@ -14746,15 +14758,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14773,18 +14785,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14951,7 +14963,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Valitse relaatioluettelosta"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15475,7 +15486,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Vierasmaja"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15511,7 +15521,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "valinnat"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15538,7 +15547,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Mittaukset"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -15548,5 +15556,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
 msgid "Add new layer"
-msgstr ""
+msgstr "Lisää uusi taso"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
@@ -16990,32 +16998,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Palauta"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Objektin historia"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Elementin historia"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Valmistellaan OSM-karttatietoja..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Hae muutoskokoelmia"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Virhe: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relaatio..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Näytä muutoskokoelma {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17251,5 +17260,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17326,16 +17334,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tagien esiasetusten testaaja"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "Tagien esiasetuslähteet täytyy määritellä ensin asetuksissa."
@@ -18181,57 +18189,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Poista objektit"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Poista objektit"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Valitse jos tiedot pitäisi ladata uudelle tasolle"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Anna ladattavan objektin ID"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Poista objektit"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Poista objektit"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Aloita lataus"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Sulje ikkuna ja peruuta lataus"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Tiedosto: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Ladataan {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Piste {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18996,4 +18996,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Näytä"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19406,4 +19416,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "alas"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19589,7 +19605,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Muutoskokoelmaa suljetaan"
+msgstr ""
 
 #. Plugin routes
@@ -19661,6 +19676,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19669,15 +19692,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19686,5 +19709,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32146,4 +32169,7 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Lähetetään {0} objektia..."
+
 #~ msgid "Unknown version"
 #~ msgstr "Tuntematon versio"
@@ -32169,7 +32195,4 @@
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Revert"
-#~ msgstr "Palauta"
 
 #~ msgid "Date"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 21299)
+++ applications/editors/josm/i18n/po/fr.po	(revision 21304)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-04 15:26+0000\n"
-"Last-Translator: isnogoud <Unknown>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-13 22:14+0000\n"
+"Last-Translator: metehyi <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,10 +14,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:52+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -30,12 +30,12 @@
 msgstr "Aide"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "L’URL de fichier est invalide, elle est ignorée : \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -64,5 +64,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -74,5 +74,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -95,10 +95,10 @@
 msgstr "Attention"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Le paramètre \"downloadgps\" n’accepte pas de noms de fichiers ou d’URLs."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -232,5 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -282,4 +282,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -338,4 +339,13 @@
 msgstr "Ajouter un nœud en indiquant une latitude et une longitude."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -349,8 +359,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -406,5 +416,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -460,5 +470,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -469,7 +479,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -487,7 +498,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -555,28 +566,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Aucune sélection sur laquelle zoomer."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zoomer sur {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zoomer la vue sur {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Afficher : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Aucun conflit sur lequel zoomer"
@@ -669,5 +680,5 @@
 msgstr "Fusionner {0} chemins"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Veuillez sélectionner au moins deux chemins à fusionner."
@@ -717,5 +728,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -810,5 +821,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Sélectionner le type d'objet OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -826,5 +837,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Télécharger l'objet"
@@ -870,5 +881,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -999,26 +1010,26 @@
 msgstr "Pas d’intersection trouvée. Rien n’a été modifié."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Nœuds ajoutés sur toutes les intersections"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 "Supprimer les chemins qui ne font pas partie d’un multipolygone interne"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Corriger les relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "A fusionné une aire superposée sur elle-même"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "A fusionné des aires superposées"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1028,33 +1039,33 @@
 "vérifier qu’aucune erreur n’a été introduite."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Entrer des valeurs pour tous les conflits."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Résoudre les conflits"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Résoudre les conflits d’attributs"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Élément supprimé des relations"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Joindre les aires : supprimer les chemins courts"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Chemin fermé"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Supprime les attributs des chemins internes"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Fonction de jonction des aires"
@@ -1073,5 +1084,5 @@
 msgstr "Joindre le nœud et la ligne"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Pas de raccourci"
@@ -1543,8 +1554,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1554,5 +1565,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1972,20 +1983,27 @@
 msgstr "Annuler la dernière action"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Tout désélectionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Désélectionner tous les objets."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Tout désélectionner (Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Tout désélectionner (Echap)"
@@ -2010,5 +2028,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:28
 msgid "Update modified"
-msgstr "Mise à jour modifiée"
+msgstr "Mise à jour des modifications"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:26
@@ -2108,16 +2126,12 @@
 msgstr "Afficher/Masquer la vue fil de fer"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Zoom avant"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zoom arrière"
@@ -2337,9 +2351,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2357,52 +2371,52 @@
 "supprimer les objets s’y rapportant."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Dessiner"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Dessiner des nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Mode : Dessiner"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Impossible d’ajouter un nœud en dehors du monde."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Ajouter un nœud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Ajouter un nœud au chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Connecter le chemin au nœud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Ajouter un nœud au chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Ajouter et connecter un nœud au chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Créer un nouveau nœud."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Sélectionner le nœud sous le pointeur."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2411,14 +2425,14 @@
 msgstr[1] "Ajouter un nouveau nœud aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Commencer un nouveau chemin à partir du dernier nœud."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Continuer le chemin à partir du dernier nœud."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Terminer le chemin."
@@ -3001,5 +3015,5 @@
 msgstr "Ajouter la relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3934,5 +3948,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "sélectionné"
@@ -3963,5 +3977,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "arrière-plan"
@@ -4047,9 +4061,9 @@
 msgstr "Zone PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Pologne)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4149,6 +4163,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4268,39 +4282,39 @@
 "elle est ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Envoyer les préférences"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Envoyer les préférences vers le serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "chaîne de caractères"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Nom de l’utilisateur."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Mot de passe OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 "Redimensionner l’applet aux dimensions suivantes (format : LARGEURxHAUTEUR)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "texte;texte;…"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4310,5 +4324,5 @@
 "lat=y&lon=x&zoom=z ou encore un nom de fichier."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4318,5 +4332,5 @@
 "une URL avec lat=y&lon=x&zoom=z ou encore un nom de fichier."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4326,48 +4340,48 @@
 "URL osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "n’importe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 "Si spécifié, rétablir la configuration par défaut au lieu de lire ceci."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "usage"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Options"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Montrer cette aide"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argument de géométrie standard UNIX"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Télécharger la zone délimitée"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Télécharger le lieu se rapportant à l’URL (avec lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4375,9 +4389,9 @@
 "Fichier/Ouvrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Télécharger la zone délimitée en données GPS brutes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4385,34 +4399,34 @@
 "lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Sélectionner avec la recherche actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Lancer maximisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Rétablir les préférences par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Définissez la langue"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 "options disponibles en tant que fichiers de propriétés système pour Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CHEMIN/VERS/REPERTOIRE/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Changer le répertoire pour tous les paramètres utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4425,9 +4439,9 @@
 "     pour spécifier la taille maximale de mémoire allouée en mégaoctets"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exemples"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4437,37 +4451,37 @@
 "cet ordre."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Assurez-vous de charger des données si vous utilisez --sélection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialisation"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Mise à jour des greffons..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installation des greffons mis à jour"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Chargement des premiers greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Régalage des valeurs par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Création de l’interface graphique de l’utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Chargement des greffons"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4480,5 +4494,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4604,10 +4618,10 @@
 msgstr "Utilisateur :"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "le calque n’est pas dans la liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -5056,5 +5070,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5311,5 +5325,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5317,7 +5331,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>Pour garder votre version locale, JOSM<br>doit remettre l’identifiant "
-"de la primitive  {0} à 0.<br>Le serveur lui assignera un nouvel "
-"identifiant<br>au prochain envoi<br>Êtes-vous d’accord ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5573,6 +5584,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5583,5 +5594,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5890,5 +5901,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5941,7 +5952,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
-#, fuzzy, java-format
+#, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Filtre Masqué: {0} Désactivé: {0}"
+msgstr "FIltre caché:{0} Désactivé:{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -5963,5 +5974,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Recharger"
@@ -6017,9 +6028,9 @@
 msgstr "Dupliquer ce calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Déplacer le calque vers le haut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Déplacer le calque vers le bas."
@@ -7162,8 +7173,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7835,55 +7846,55 @@
 msgstr "Ajouter des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Modifier la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Voulez-vous vraiment supprimer la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Supprimer des propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé / valeur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifier la valeur de la clé sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Sélectionner une relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Sélectionner une relation dans la sélection principale."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Sélectionner dans la liste des relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Sélectionnez une relation dans la liste des relations."
@@ -8558,5 +8569,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Limites"
@@ -8588,21 +8599,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Exception NullPointer. Il manque sans doute des attributs."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Rechercher…"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Commencer la recherche"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Interrogation du serveur de noms"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Interrogation du serveur de noms..."
@@ -8624,5 +8635,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8636,5 +8647,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8670,5 +8681,5 @@
 msgstr "Numéros de tuiles"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
@@ -8676,9 +8687,9 @@
 "La lecture du fichier CSS ''help-browser.css'' a échoué. Exception : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "Navigateur d’aide de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8698,5 +8709,5 @@
 "votre langue ({1})</a> et l’<a href=\"{3}\">aide en anglais</a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -9019,5 +9030,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Conflits détectés"
@@ -9871,7 +9882,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Envoi de {0} objets..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Envoi d’{0} objet..."
+msgstr[1] "Envoi de {0} objets..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -10047,4 +10061,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "point GPS"
@@ -10219,5 +10234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10287,14 +10302,14 @@
 msgstr "Calque de données {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "en dehors de la zone téléchargée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -10302,5 +10317,5 @@
 "0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10309,5 +10324,5 @@
 msgstr[1] "Il y avait {0} conflits détectés."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10325,5 +10340,5 @@
 "{0} objets<br>du jeu de données car ils étaient supprimés sur le serveur."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10340,11 +10355,11 @@
 "conflits pour les résoudre manuellement."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Fermer la fenêtre et continuer les modifications"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10353,32 +10368,32 @@
 msgstr[1] "{0} supprimés"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} est consistué de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "vide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Version de l’API : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convertir en calque GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Test de cohérence de l’ensemble de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "Pas de problème trouvé."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Les problèmes suivants ont été trouvés:"
@@ -10425,8 +10440,4 @@
 msgstr[0] "{0} point"
 msgstr[1] "{0} points"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "Point GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
@@ -10722,5 +10733,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Images géolocalisées"
@@ -10745,5 +10756,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Supprimer le fichier de l'image du disque"
@@ -10777,55 +10788,55 @@
 msgstr "Erreur sur le fichier {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Afficher les photos géolocalisées"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Précédent"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Afficher l'image précédente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Géoimage : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Supprimer la photo du calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Effacer un fichier du disque"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Suivant"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Montrer la prochaine image"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centrer la vue"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Meilleur zoom et 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "Déplacer la fenêtre sur le panneau"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10836,5 +10847,5 @@
 "Altitude : {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10907,7 +10918,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Afficher/Masquer le texte/lesicônes"
+msgstr "Afficher Texte/Icônes"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11843,35 +11853,35 @@
 msgstr "Étalonnage de l’enregistrement de la voix"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Modèle de rendu {0} : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Choisir"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Choisir une couleur pour {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Mettre la valeur par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Réinitialiser"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Couleurs utilisées par les différents objets dans JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Couleurs"
@@ -12336,17 +12346,17 @@
 msgstr "URL de description des greffons."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "désactivé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "aucun modifieur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Raccourcis clavier</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12357,5 +12367,5 @@
 "modifications.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12372,5 +12382,5 @@
 "modifications.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12394,9 +12404,9 @@
 "conflits.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Touches de raccourcis</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12413,5 +12423,5 @@
 "par hasard.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12420,66 +12430,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Lisez-moi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Valeur par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Désactivé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Clé :"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Attention : n’utilisez que les vraies touches de votre clavier !"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis des touches du clavier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Edition Raccourcis"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Premier modifieur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Second modifieur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Troisième modifieur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Raccourcis des menus"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Raccourcis des touches spéciales"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Raccourcis des sous-fenêtres"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Touches de raccourcis"
@@ -12542,21 +12552,21 @@
 msgstr "Vous devez redémarrer JOSM pour que les réglages prennent effet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Afficher les coordonnées en"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Méthode de projection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Code de la projection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Projection de la carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12602,10 +12612,9 @@
 msgstr "Modifier les raccourcis clavier manuellement."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Action"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Raccourci"
@@ -13126,24 +13135,23 @@
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Impossible de lire la source des balises : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur d’analyse de {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Les éléments de type {0} sont supportés."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13153,17 +13161,17 @@
 msgstr[1] "Modifier {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Rien n’est sélectionné !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Appliquer le pré-réglage"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Changer les propriétés"
@@ -13727,11 +13735,4 @@
 msgid "Preparing upload request..."
 msgstr "Préparation de la requête d’envoi des données..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Envoi d’{0} objet..."
-msgstr[1] "Envoi de {0} objets..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14099,7 +14100,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "Attribut requis \"{0}\" manquant."
+msgstr "Clé manquante ou attribut de valeur dans étiquette manquant."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -14253,7 +14253,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(à la ligne {0}, colonne {1})"
+msgstr "Ligne {0} colonne {1}: "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -15228,5 +15228,5 @@
 msgstr "unutilisé"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -15239,5 +15239,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -15247,5 +15247,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15256,5 +15256,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -15656,15 +15656,15 @@
 msgstr "Numéros :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr "Impossible de construire un bâtiment en dehors du monde."
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Créer un bâtiment"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15683,18 +15683,18 @@
 msgstr "Longueur de l’escalier :"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr "Dessiner des bâtiments"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr "Point de l’angle du bâtiment à partir duquel dessiner"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr "Point opposé du bâtiment"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "Définir la largeur des bâtiments"
@@ -15879,7 +15879,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Sélectionnez le calque WMS"
+msgstr "Sélectionner le premier calque WMS dans la liste"
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16438,7 +16437,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Chambre d’hôtes"
+msgstr "J'utilise la souris"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -16478,7 +16476,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Optionnel"
+msgstr "(optionnel)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16507,11 +16504,10 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Décrement"
+msgstr "Département"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
 msgid "<html>Departement number (optional)</html>"
-msgstr ""
+msgstr "<html> Numéro de département (optionnel)</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
@@ -18006,32 +18002,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr "Historique des objets"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Rétablir"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr "Réversion de l'historique"
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr "Préparation des données historiques"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr "Réversion du groupe de changement"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Historique de l’objet"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Historique de l’objet"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Récupération des données de l’historique OSM…"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Requête de groupes de modifications"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "demandé : {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relation…"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Afficher le groupe de modifications {0}"
+msgstr "Réversion du groupe de changement #{0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18269,5 +18266,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -18344,16 +18340,16 @@
 msgstr "numéro de colonne {0} inattendu"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Vérificateur de balises"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr "Ouvrir l’outil de vérification des balises afin de les prévisualiser."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -19205,5 +19201,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
 msgid "Go to the Advanced Editor and remove the members"
-msgstr ""
+msgstr "Utiliser l'éditeur avancé et supprimer les membres"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25
@@ -19213,4 +19209,6 @@
 "recommended to use standard values for <tt>except</tt> only."
 msgstr ""
+"La balise <tt>except</tt> a la valeur non standard <tt>{0}</tt>. Il est "
+"recommandé de n'utiliser que des valeurs standard pour <tt>except</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:34
@@ -19221,14 +19219,14 @@
 #, java-format
 msgid "The required tag <tt>{0}={1}</tt> is missing."
-msgstr ""
+msgstr "La balise requise <tt>{0}={1}</tt> manque."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
 msgid "Add missing tag"
-msgstr ""
+msgstr "Ajouter la balise manquante"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46
 #, java-format
 msgid "Add the missing tag {0}={1}"
-msgstr ""
+msgstr "Ajouter la balise manquante {0}={1}"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
@@ -19243,9 +19241,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
 msgid "Split now"
-msgstr ""
+msgstr "Séparer maintenant"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Splits the way"
-msgstr ""
+msgstr "Séparer les chemins"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:45
@@ -19255,4 +19253,6 @@
 "span> as member with role <tt>{1}</tt>."
 msgstr ""
+"Cette interdiction de tourner utilise le noeud OSM <span class=\"object-name"
+"\">{0}</span> comme membre avec le rôle <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
@@ -19278,57 +19278,50 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Supprimer des objets"
+msgstr "Restaurer l'objet"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Supprimer des objets"
+msgstr "Réstaurer l'objet par id"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Télécharger les données dans un nouveau calque"
+msgstr ""
+"Sélectionner si les données doivent être ajoutées dans un nouveau calque"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Veuillez saisir l’identifiant de l’objet à télécharger"
+msgstr "Entrer l'ID de l'objet à restaurer"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Supprimer des objets"
+msgstr "Restaurer l'objet"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Supprimer des objets"
+msgstr "Restaurer l'objet"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Commencer à ajuster"
+msgstr "Début de la restauration"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Fermer la fenêtre et annuler le téléchargement"
+msgstr "Fermer la boîte de dialogue et annuler"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Fichier : {0}"
+msgstr "Va obtenir {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Chargement {0}"
+msgstr "Recherche de {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Nœud {0}"
+msgstr "{0}  trouvé"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -20097,4 +20090,14 @@
 msgstr "{0}…"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Vidéoclub"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -20383,6 +20386,5 @@
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
-"La zone demandée est trop grande. Vous pouvez zoomer ou changer la "
-"résolution."
+"La zone demandée est trop grande. Prière de changer le zoom ou la résolution."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
@@ -20542,4 +20544,10 @@
 "Vous devez rendre vos modifications publiques pour envoyer de nouvelles "
 "données"
+
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "vers le bas"
 
 #. Plugin AddrInterpolation
@@ -20761,7 +20769,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Ouvrir la fenêtre des requêtes des groupes de modifications"
+msgstr ""
 
 #. Plugin routes
@@ -20826,16 +20833,15 @@
 #. Plugin turnrestrictions
 #: build/trans_plugins.java:81
-#, fuzzy
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
 msgstr ""
-"Le greffon turnrestrictions permet de créer et de gérer des interdictions de "
-"tourner dans la base de données OpenStreetMap."
+"Permet d’ajouter des informations sur les interdictions de tourner dans la "
+"base de données OSM."
 
 #. Plugin undelete
 #: build/trans_plugins.java:83
 msgid "Allows undeleting object from OSM database"
-msgstr ""
+msgstr "Authoriser la restauration de l'objet depuis la base de donnée OSM"
 
 #. Plugin validator
@@ -20848,6 +20854,14 @@
 "vérificateur orthographique est intégré pour les attributs."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20858,15 +20872,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Facilite le téléchargement le long de plusieurs chemins interconnectés"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Sélectionne une séquence de chemins connectés non-ramifiés"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20876,5 +20890,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -33338,9 +33352,9 @@
 msgstr "Sicile - Italie"
 
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Sélectionner automatiquement le premier calque WMS lors du téléchargement "
-#~ "du cadastre."
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Envoi de {0} objets..."
+
+#~ msgid "GPS point"
+#~ msgstr "Point GPS"
 
 #~ msgid "Move"
@@ -34115,7 +34129,4 @@
 #~ msgstr "Cliquer sur Recharger pour rafraîchir la liste"
 
-#~ msgid "Revert"
-#~ msgstr "Rétablir"
-
 #~ msgid ""
 #~ "Revert the state of all currently selected objects to the version "
@@ -34973,2 +34984,8 @@
 #~ msgid "Use all their elements"
 #~ msgstr "Utiliser tous leurs éléments"
+
+#~ msgid ""
+#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
+#~ msgstr ""
+#~ "Sélectionner automatiquement le premier calque WMS lors du téléchargement "
+#~ "du cadastre."
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 21299)
+++ applications/editors/josm/i18n/po/gl.po	(revision 21304)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-05 22:05+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-12 21:38+0000\n"
 "Last-Translator: Dario <dario.villar.v@gmail.com>\n"
 "Language-Team: Galician <gl@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:52+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Axuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de ficheiro mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "Aviso"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "O parametro \"downloadgps\" non acepta nomes de ficheiros ou URLs"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -232,5 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -282,4 +282,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -336,4 +337,13 @@
 msgstr "Engadir un nodo introducindo latitude e lonxitude."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -347,8 +357,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -404,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -458,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -467,7 +477,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -485,7 +496,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -553,28 +564,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Non se seleccionou nada sobre o que facer zoom."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Facer zoom a {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Facer zoom na vista a {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Vista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Non hai conflitos sobre os que facer zoom"
@@ -667,5 +678,5 @@
 msgstr "Combinar {0} vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Por favor, selecciona polo menos dúas vías para combinar."
@@ -715,5 +726,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -810,5 +821,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Escolle o tipo de obxecto OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -826,5 +837,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Descargar obxecto"
@@ -869,5 +880,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -997,25 +1008,25 @@
 msgstr "Nada interesante foi atopado. Nada foi cambiado..."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Engadir nodo en todas as interseccións"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Eliminiar vías que non formen parte de un multipolígono interior"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Arranxar relacións"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Areas auto-superpostas unidas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Areas superpostas unidas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1025,33 +1036,33 @@
 "verifique que non se introduciron erros."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Introducir valores para todos os conflitos."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Resolver Conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Arranxar conflictos de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Elementos borrados das Relacions"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Une Areas: Borra Vías"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Vía Pechada"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Eliminar etiquetas de vías internas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Función de unor áreas"
@@ -1070,5 +1081,5 @@
 msgstr "Unir Nodo e Liña"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Sen Atallo"
@@ -1540,8 +1551,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1551,5 +1562,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1970,20 +1981,27 @@
 msgstr "Desfacer a última acción."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Deseleccionar Todo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Deseleccionar todos os obxectos."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Deseleccionar Todo (Enfocar)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Deseleccionar Todo (Escape)"
@@ -2019,5 +2037,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
 msgid "No current dataset found"
-msgstr ""
+msgstr "Conxunto de datos actual no atopado"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
@@ -2108,16 +2126,12 @@
 msgstr "Cambiar Vista de Malla"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Aumentar Zoom"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Reducir Zoom"
@@ -2272,4 +2286,10 @@
 "</strong> to ignore.<br></html>"
 msgstr ""
+"<html>Hay {0} primitivas no seu conxunto de datos local que<br>poden estar "
+"borradas no servidor. Si posteriormente trata de borralas ou "
+"<br>actualizalas probablemente o servidor informará de un <br>conflicto."
+"<br><br>Pulse <strong>{1}</strong> para comprobar o estado de estas "
+"primitivas<br>no servidor-<br>Pulse <strong>{2}</strong> para ignorar.<br></"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
@@ -2330,9 +2350,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2349,52 +2369,52 @@
 "nodos sen usar cando se borre unha vía. Ctrl: borrar obxectos aludidos."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Debuxar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Debuxar nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Foco do Debuxo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Non se pode engadir un nodo fora do mundo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Engadir nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Engadir nodo na vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Conectar via existente a nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Engadir un novo nodo a unha via existente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Engadir nodo a vía e conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Crear novo nodo."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Seleccionar nodo baixo o cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2403,14 +2423,14 @@
 msgstr[1] "Insertar novo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Comezar nova vía a partir do último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Continuar vía a partir do último nodo."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Rematar debuxo."
@@ -2689,4 +2709,6 @@
 "assigned version)"
 msgstr ""
+"<b>versión:</b>...-obxecto coa versión dada (0 obxectos sen unha versión "
+"asignada)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
@@ -2695,4 +2717,6 @@
 "assigned changeset)"
 msgstr ""
+"<b>conxunto de cambios:</b>...-obxecto co identificador do conxunto de "
+"cambios dado (0 obxectos sen un conxunto de cambios asignado)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
@@ -2898,4 +2922,6 @@
 "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
 msgstr ""
+"Aviso: Recortouse automáticamente o valor do atributo \"{0}\" no obxecto "
+"borrado {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67
@@ -2960,5 +2986,5 @@
 msgstr "Engadir relación {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3038,4 +3064,6 @@
 "conflict cannot be added.</html>"
 msgstr ""
+"<html>A capa \"{0}\" ainda ten un conflicto coa primitiva<br>\"{1}\"."
+"<br>Este conflicto non pode ser engadido.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
@@ -3390,4 +3418,6 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
+"Aviso: Non se atopa o arquivo de preferencias \"{0}\". Creanso un novo "
+"arquivo de preferencias por defecto."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
@@ -3406,4 +3436,6 @@
 "to default: {0}</html>"
 msgstr ""
+"<hmtl>Erro ao inicializar as preferencias.<br> Erro ao reiniciar o arquivo "
+"de preferencias por defecto :{0}.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3413,4 +3445,7 @@
 "<br> and creating a new default preference file.</html>"
 msgstr ""
+"<html>O arquivo de preferencias contén erros.<br> Realizano unha copia de "
+"seguridade a <br>{0}<br> e creando un novo arquivo de preferencias por "
+"defecto.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3451,5 +3486,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
+msgstr "Erro: Liña inesperada \"{0}\" na lista de marcadores do servidor"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
@@ -3459,4 +3494,6 @@
 "server"
 msgstr ""
+"Erro: Dobre valor ilegal \"{0}\" na liña \"{1}\" na  lista de marcadores do "
+"servidor"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
@@ -3466,4 +3503,6 @@
 "{1}"
 msgstr ""
+"Fallou ao cargar os  marcadores de \"{0}\" por motivos de seguridade. A "
+"Excepción foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3586,5 +3625,5 @@
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Non se atopa o obxectivo a misturar do tipo {0} con id {1}"
 
 #. should not happen
@@ -3867,5 +3906,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "seleccionado"
@@ -3896,5 +3935,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "fondo"
@@ -3927,4 +3966,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
+"Atención: Fallou ao abrir a secuencia de entrada para o recurso \"/data/{0}"
+"\". Non se pode cargar NTF <-> malla RGF93"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -3978,9 +4019,9 @@
 msgstr "PUWG Zona"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4080,6 +4121,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4197,38 +4238,38 @@
 msgstr "Esperábase un valor non vacío para o parámetro \"{0}\" tívose \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Subir Preferencias"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Subir as preferencias actuais ó servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "cadea"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Nome do usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Contrasinal de OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Redimensionar o applet á xeometría indicada (formato: ANCHOxALTO)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "cadea;cadea;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4238,5 +4279,5 @@
 "lat=y&lon=x&zoom=z ou un nome de ficheiro"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4246,5 +4287,5 @@
 "contendo lat=y&lon=x&zoom=z ou un nome de ficheiro"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4254,47 +4295,47 @@
 "google ou unha URL que devolva osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "calquera"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Si se especifica, reestablecer a configuración en lugar de lela."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opcións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Amosar esta axuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argumento de xeometría unix estandar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Descargar a caixa de límites"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descargar a ubicación da url (con lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4302,41 +4343,41 @@
 "Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Descargar a caixa de límites como datos gps en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Descargar localozación na url (con lat=x&lon=y&zoom=z) como gps en crú"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Seleccionar coa busca indicada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Lanzar en modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Restablecer as preferencias ós valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Establecer a linguaxe"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "opción dadas polas propiedades do sistema de Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/RUTA/Á/CARPETA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Cambiar o directorio para as configuración de todos os usuarios"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4350,9 +4391,9 @@
 "en megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4362,37 +4403,37 @@
 "orde."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Asegurate de que cargas algún dato se usas --selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicializando"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Actualizando  Plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Instalando plugins actualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Cargando extensións anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Establecendo valores predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creando Interface (GUI) principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Cargando extensións"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4405,5 +4446,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4517,4 +4558,6 @@
 "this list with the mouse.<hr>"
 msgstr ""
+"Prema co botón central outra vez para desplazarse polas opcións. <br>Manteña "
+"CTRL para escoller directamente desta lista co rato.<hr>"
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
@@ -4527,10 +4570,10 @@
 msgstr "Usuario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "a capa non está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4636,4 +4679,6 @@
 "level.</html>"
 msgstr ""
+"<html> Escolla un <strong> rango de teselas de OSM</OSM> nun nivel zoom dado."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
@@ -4647,5 +4692,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
-msgstr ""
+msgstr "ata a tesela"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
@@ -4656,24 +4701,28 @@
 "html>"
 msgstr ""
+"<html>Alternativamente pode introducir unha <strong> dirección de tesela</"
+"strong> para unha tesela no formato <i> nivel_de_zoom/x/y</i>, por exemplo "
+"<i>15/256/223</i>.As direccións de teselas no formato<i>zoom,x,y</i> ou "
+"<i>zoom;x;i</i>tamén són válidas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
 msgid "Tile address:"
-msgstr ""
+msgstr "Dirección da tesela:"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
 msgid "Apply the tile address"
-msgstr ""
+msgstr "Aplicar a dirección da tesela"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
 msgid "Please enter a tile address"
-msgstr ""
+msgstr "Por favor, introduza a dirección da tesela"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
 msgid "The current value isn''t a valid tile address"
-msgstr ""
+msgstr "O valor actual non é unha dirección de tesela válida."
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
 msgid "Please enter a tile index"
-msgstr ""
+msgstr "Por favor introduza un índice de tesela"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
@@ -4764,4 +4813,6 @@
 "Merged node list frozen. No pending conflicts in the node list of this way"
 msgstr ""
+"Lista de nodos misturados conxeada. Non hay conflictos pendentes na lista de "
+"nodos desta vía"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
@@ -4782,4 +4833,6 @@
 "relation"
 msgstr ""
+"Lista de membros misturados conxeada. Non hay conflictos pendentes na lista "
+"de nodos desta relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
@@ -4817,4 +4870,6 @@
 "primitive<br>because they are deleted in the target dataset:"
 msgstr ""
+"As seguinte primitivas non poden ser copiadas á primitiva  de destino<br> "
+"porque foron eliminadas no conxunto de datos de destino:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
@@ -4827,4 +4882,6 @@
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
+"A lista no rol {0} non está a participar actualmente na parella de "
+"comparación."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:801
@@ -4908,9 +4965,11 @@
 "merged elements."
 msgstr ""
+"Copiar os meus elementos escollidos despois do primeiro elemento escollido "
+"na lista de elementos misturados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544
 msgid ""
 "Copy their selected element to the start of the list of merged elements."
-msgstr ""
+msgstr "Copiar o seu elemento escollido na lista de elementos misturados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
@@ -4958,5 +5017,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5444,6 +5503,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5454,5 +5513,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5730,5 +5789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5803,5 +5862,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Recargar"
@@ -5858,9 +5917,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Mover a capa seleccionada unha fila cara arriba."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Mover a capa seleccionada unha fila cara abaixo."
@@ -6989,8 +7048,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7609,55 +7668,55 @@
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Borrar da relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Borrar realmente a selección da relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Engadir un novo par clave/valor para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da clave seleccionada para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8288,5 +8347,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8318,21 +8377,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Excepción de punteiro nulo, posiblemente faltan algunhas etiquetas."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8354,5 +8413,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8366,5 +8425,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8400,14 +8459,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8421,5 +8480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8715,5 +8774,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9454,7 +9513,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9611,4 +9673,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "punto gps"
@@ -9777,5 +9840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9841,18 +9904,18 @@
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "fora da área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9861,5 +9924,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9873,5 +9936,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9884,11 +9947,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9897,32 +9960,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} composto de:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9968,8 +10031,4 @@
 msgstr[1] "{0} puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10244,5 +10303,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imaxes xeo-etiquetadas"
@@ -10267,5 +10326,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10297,55 +10356,55 @@
 msgstr "Erro no ficheiro {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Previo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Eliminar foto da capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centrar vista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10356,5 +10415,5 @@
 "Altitude: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10422,7 +10481,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Amosar/Ocultar Texto/Iconas"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11249,35 +11307,35 @@
 msgstr "Calibración do grabador de voz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Estilo de pintura {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Escoller"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Escolle unha cor para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Establecer a predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Establecer todos ós predeterminados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Cores usadas por diferentes obxectos en JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Cores"
@@ -11739,17 +11797,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "desactivado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "sen modificador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Atallos de Teclado</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11757,5 +11815,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11766,5 +11824,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11781,9 +11839,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Grupos de Modificadores</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11794,5 +11852,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11803,66 +11861,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Ler Antes"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Usar predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Tecla:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Atención: Usar só teclas reais do teclado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Atallos de Teclado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Editar Atallos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Modificador principal:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Modificador secundario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Modificador terciario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Atallos de menú"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Teclas rápidas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Atallos de ventá"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Grupos de modificadores"
@@ -11925,21 +11983,21 @@
 msgstr "Debes reiniciar JOSM para que algúns parámetros se fagan efectivos."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Amosar coordenadas como"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Método de proxección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Proxección do mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11984,10 +12042,9 @@
 msgstr "Cambiando manualmente os atallos de teclado."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Acción"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Atallo"
@@ -12462,24 +12519,23 @@
 msgstr "Tipo descoñecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Os elementos do tipo {0} están soportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12489,17 +12545,17 @@
 msgstr[1] "Cambiar {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Selección non axeitada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Aplicar axuste preestablecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Cambiar Propiedades"
@@ -13010,11 +13066,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13472,31 +13521,31 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
 msgid "Downloading from OSM Server..."
-msgstr ""
+msgstr "Descargando dende o servidor de OSM..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
 msgid "Downloading referring ways ..."
-msgstr ""
+msgstr "Descargando vías referidas..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
 msgid "Downloading referring relations ..."
-msgstr ""
+msgstr "Descargando relacións referidas..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Lendo conxunto de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
 msgid "Downloading changesets ..."
-msgstr ""
+msgstr "Descargando conxuntos de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94
 #, java-format
 msgid "Reading changeset {0} ..."
-msgstr ""
+msgstr "Lendo conxunto de cambios {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100
 #, java-format
 msgid "Downloading changeset {0} ..."
-msgstr ""
+msgstr "Descargando conxunto de cambios {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130
@@ -13504,20 +13553,20 @@
 msgid "Downloading {0} changeset ..."
 msgid_plural "Downloading {0} changesets ..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Descargando {0} conxunto de cambios..."
+msgstr[1] "Descargando {0} conxuntos de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr ""
+msgstr "({0}/{1}) Descargando conxunto de cambios {2}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
 #, java-format
 msgid "Downloading content for changeset {0} ..."
-msgstr ""
+msgstr "Descargando contido para o conxunto de cambios {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
 msgid "Downloading history..."
-msgstr ""
+msgstr "Descargando historial..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
@@ -13528,5 +13577,5 @@
 #, java-format
 msgid "Failed to open connection to API {0}."
-msgstr ""
+msgstr "Fallou ao abrir a conexión da API {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87
@@ -13539,5 +13588,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
 msgid "XML tag <user> is missing."
-msgstr ""
+msgstr "A etiqueta XML <user> non se atopa"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
@@ -13547,5 +13596,5 @@
 #, java-format
 msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
-msgstr ""
+msgstr "Falta o atributo \"{0}\" na etiqueta XML \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
@@ -13556,40 +13605,41 @@
 msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
 msgstr ""
+"Valor ilegal para o atributo \"{0}\" na etiqueta XML \"{1}\". Obtido {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
 msgid "Reading user info ..."
-msgstr ""
+msgstr "Lendo información de usuario..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
+msgstr "Comezando a subir con unha petición por primitiva..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} restantes. Subindo nodo ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} restantes. Subindo vñia ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
+msgstr "{0}% ({1}/{2}), {3} restantes. Subindo relación ''{4}'' (id: {5})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:122
 msgid "Starting to upload in one request ..."
-msgstr ""
+msgstr "Comezando a subir  nunha única petición..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 #, java-format
 msgid "Value >0 expected for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Valor >0 esperado para o parámetro \"{0}\", obtívose {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
 msgid "Starting to upload in chunks..."
-msgstr ""
+msgstr "Comeza a subir en anacos..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:160
@@ -13597,31 +13647,31 @@
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "({0}/{1}) Subiendo {2} obxecto..."
+msgstr[1] "({0}/{1}) Subiendo {2} obxectos..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187
 msgid "Uploading data ..."
-msgstr ""
+msgstr "Subindo datos..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:218
 msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
+msgstr "Atopouse un ID 0 inesperado para primitivas de osm"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
 msgid "Skip download"
-msgstr ""
+msgstr "Saltar descarga"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:104
 msgid "Download Plugin"
-msgstr ""
+msgstr "Descargar o complemento"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:105
 msgid "Skip Download"
-msgstr ""
+msgstr "Omitir a descarga"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:107
 #, java-format
 msgid "JOSM version {0} required for plugin {1}."
-msgstr ""
+msgstr "Versión de JOSM {0} requerida para o complemento {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
@@ -13631,4 +13681,6 @@
 "Skipping download."
 msgstr ""
+"Atención: Non se pode descargar o plugin \"{0}\". O enlace de descarga é "
+"descoñecido. Saltando a descarga."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
@@ -13638,14 +13690,16 @@
 "valid URL. Skipping download."
 msgstr ""
+"Atención: Non se pode descargar o plugin \"{0}\". O enlace de descarga \"{1}"
+"\" non é unha URL válida. Saltando a descarga."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
 #, java-format
 msgid "Failed to create plugin directory ''{0}''"
-msgstr ""
+msgstr "Fallou ao crear o directorio do plugin \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:175
 #, java-format
 msgid "Downloading Plugin {0}..."
-msgstr ""
+msgstr "Descargando complemento {0}..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
@@ -13659,6 +13713,6 @@
 msgid_plural ""
 "The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "O seguinte complemento xa non é preciso e foi desactivado:"
+msgstr[1] "Os seguintes complementos xa non son precisos e foron desactivados:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
@@ -13675,4 +13729,6 @@
 "updated as well.<br><br>Update plugins now?"
 msgstr ""
+"Actualizaches o te JOSM. <br> Para evitar problemas deberia actualizar os "
+"complementos.<br><br>Actualizar complementos agora?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
@@ -13683,13 +13739,13 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
 msgid "Click to update the activated plugins"
-msgstr ""
+msgstr "Prema para actualizar os complementos activos,"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
 msgid "Skip update"
-msgstr ""
+msgstr "Omitir actualización"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
 msgid "Click to skip updating the activated plugins"
-msgstr ""
+msgstr "Prema para omitir a actualizaciñón dos complementos"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215
@@ -13743,5 +13799,5 @@
 #, java-format
 msgid "loading plugin ''{0}'' (version {1})"
-msgstr ""
+msgstr "cargando complemento \"{0}\" (version {1})"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
@@ -13759,5 +13815,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
 msgid "Loading plugins ..."
-msgstr ""
+msgstr "Cargando complementos..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
@@ -13768,17 +13824,17 @@
 #, java-format
 msgid "Loading plugin ''{0}''..."
-msgstr ""
+msgstr "Cargando complemento ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM non puido atopar información sobre o complemento seguinte:"
+msgstr[1] "JOSM non puido atopar información sobre os complementos seguintes:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "O complemento non vai a ser cargado."
+msgstr[1] "Os complementos non van a ser cargados."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
@@ -13938,5 +13994,5 @@
 #, java-format
 msgid "Processing file ''{0}''"
-msgstr ""
+msgstr "Procesando arquivo \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
@@ -14295,5 +14351,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14303,5 +14359,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14309,5 +14365,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14316,5 +14372,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Consello: Pode editar os atallos nas preferencias.)"
@@ -14685,15 +14741,15 @@
 msgstr "Números:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr "Non emplazar edificios fora do mundo."
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Crear edificio."
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14712,18 +14768,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr "Dibuxar edificios"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "Establecer ancho de edificios"
@@ -14898,7 +14954,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Escolle a capa a usar"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15463,7 +15518,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "opcións"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15490,7 +15544,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Decremento"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16933,32 +16986,34 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #, fuzzy
-msgid "Objects history"
-msgstr "Historia do Obxecto"
+msgid "Revert"
+msgstr "Restablecer"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "History reverter"
-msgstr "Historial do Elmento"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Preparar os datos de OSM..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Pechar o conxunto de cambios abertos"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Erro: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relación..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Conxunto de cambios {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17194,5 +17249,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17269,16 +17323,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -18124,57 +18178,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Borra obxecto"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Borra obxecto"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Seleccionar se a data deberia estar en unha nova capa"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Introduce o ID do obxecto que deberia ser descargado"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Borra obxecto"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Borra obxecto"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Comezar a descarga"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Pecha o diálogo e cancela a descarga"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Ficheiro: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Imaxes para {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Atopadas {0} coincidencias"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18920,4 +18966,14 @@
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Vídeo"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19326,4 +19382,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "abaixo"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19509,7 +19571,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Pechar o conxunto de cambios abertos"
+msgstr ""
 
 #. Plugin routes
@@ -19581,6 +19642,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19589,15 +19658,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19606,5 +19675,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -22572,5 +22641,5 @@
 #: build/trans_presets.java:1265
 msgid "Crossing"
-msgstr ""
+msgstr "Paso a nivel peatonal"
 
 #. item "Transport/Railway/Crossing"
@@ -22580,5 +22649,5 @@
 #: build/trans_presets.java:1269
 msgid "Crossing type"
-msgstr ""
+msgstr "Tipo de paso"
 
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
@@ -22586,5 +22655,5 @@
 #: build/trans_presets.java:1275
 msgid "Turntable"
-msgstr ""
+msgstr "Plataforma de xiro"
 
 #. item "Transport/Railway/Turntable"
@@ -22593,5 +22662,5 @@
 #: build/trans_presets.java:1279
 msgid "Buffer Stop"
-msgstr ""
+msgstr "Tope de vía"
 
 #. item "Transport/Railway/Buffer Stop"
@@ -22600,10 +22669,10 @@
 #: build/trans_presets.java:1284
 msgid "Aerialway"
-msgstr ""
+msgstr "Remonte"
 
 #. group "Aerialway"
 #: build/trans_presets.java:1285
 msgid "Chair Lift"
-msgstr ""
+msgstr "Telesilla"
 
 #. item "Aerialway/Chair Lift"
@@ -22611,10 +22680,10 @@
 #: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
-msgstr ""
+msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
 #: build/trans_presets.java:1291
 msgid "Drag Lift"
-msgstr ""
+msgstr "Telearrastre"
 
 #. item "Aerialway/Drag Lift"
@@ -22622,10 +22691,10 @@
 #: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
-msgstr ""
+msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
 #: build/trans_presets.java:1297
 msgid "Cable Car"
-msgstr ""
+msgstr "Telecabina"
 
 #. item "Aerialway/Cable Car"
@@ -22633,10 +22702,10 @@
 #: build/trans_presets.java:1299
 msgid "Edit Cable Car"
-msgstr ""
+msgstr "Editar telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
 #: build/trans_presets.java:1303
 msgid "Gondola"
-msgstr ""
+msgstr "Góndola"
 
 #. item "Aerialway/Gondola"
@@ -22644,5 +22713,5 @@
 #: build/trans_presets.java:1305
 msgid "Edit Gondola"
-msgstr ""
+msgstr "Editar góndola"
 
 #. item "Aerialway/Gondola" text "Name"
@@ -22650,5 +22719,5 @@
 msgctxt "aerialway"
 msgid "Station"
-msgstr ""
+msgstr "Estación"
 
 #. item "Aerialway/Station"
@@ -22657,5 +22726,5 @@
 msgctxt "aerialway"
 msgid "Edit Station"
-msgstr ""
+msgstr "Editar Estación"
 
 #. item "Aerialway/Station" text "Name"
@@ -22663,5 +22732,5 @@
 msgctxt "aerialway"
 msgid "Pylon"
-msgstr ""
+msgstr "Pilona"
 
 #. item "Aerialway/Pylon"
@@ -22670,10 +22739,10 @@
 msgctxt "aerialway"
 msgid "Edit Pylon"
-msgstr ""
+msgstr "Editar pilona"
 
 #. group "Car"
 #: build/trans_presets.java:1324
 msgid "Fuel"
-msgstr ""
+msgstr "Gasolineira"
 
 #. item "Car/Fuel"
@@ -22683,62 +22752,62 @@
 #: build/trans_presets.java:1328
 msgid "Edit Fuel"
-msgstr ""
+msgstr "Editar Gasolineira"
 
 #. item "Car/Fuel" combo "Operator"
 #: build/trans_presets.java:1330
 msgid "Agip"
-msgstr ""
+msgstr "Agip"
 
 #: build/trans_presets.java:1330
 msgid "Aral"
-msgstr ""
+msgstr "Aral"
 
 #: build/trans_presets.java:1330
 msgid "Avia"
-msgstr ""
+msgstr "Avia"
 
 #: build/trans_presets.java:1330
 msgid "BP"
-msgstr ""
+msgstr "BP"
 
 #: build/trans_presets.java:1330
 msgid "Esso"
-msgstr ""
+msgstr "Esso"
 
 #: build/trans_presets.java:1330
 msgid "OMV"
-msgstr ""
+msgstr "OMV"
 
 #: build/trans_presets.java:1330
 msgid "Q8"
-msgstr ""
+msgstr "Q8"
 
 #: build/trans_presets.java:1330
 msgid "Repsol"
-msgstr ""
+msgstr "Repsol"
 
 #: build/trans_presets.java:1330
 msgid "Shell"
-msgstr ""
+msgstr "Shell"
 
 #: build/trans_presets.java:1330
 msgid "Statoil"
-msgstr ""
+msgstr "Statoil"
 
 #: build/trans_presets.java:1330
 msgid "Tamoil"
-msgstr ""
+msgstr "Tamoil"
 
 #: build/trans_presets.java:1330
 msgid "Texaco"
-msgstr ""
+msgstr "Texaco"
 
 #: build/trans_presets.java:1330
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #: build/trans_presets.java:1330
 msgid "Indipend."
-msgstr ""
+msgstr "Indipend."
 
 #. item "Car/Fuel" text "Name"
@@ -22823,5 +22892,5 @@
 #: build/trans_presets.java:2812
 msgid "Opening Hours"
-msgstr ""
+msgstr "Horario de apertura"
 
 #. item "Car/Fuel" combo "Opening Hours"
@@ -22906,5 +22975,5 @@
 #: build/trans_presets.java:2812
 msgid "24/7"
-msgstr ""
+msgstr "24/7"
 
 #: build/trans_presets.java:1333 build/trans_presets.java:1636
@@ -22936,5 +23005,5 @@
 #: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
-msgstr ""
+msgstr "Lu-Vie 08:30-20:00"
 
 #: build/trans_presets.java:1333 build/trans_presets.java:1636
@@ -22966,69 +23035,69 @@
 #: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
+msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
 #: build/trans_presets.java:1334
 msgid "Fuel types:"
-msgstr ""
+msgstr "Tipos de combustible:"
 
 #. item "Car/Fuel" label "Fuel types:"
 #: build/trans_presets.java:1335
 msgid "Diesel"
-msgstr ""
+msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
 #: build/trans_presets.java:1336
 msgid "Bio Diesel"
-msgstr ""
+msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
 #: build/trans_presets.java:1337
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
+msgstr "Diesel (Gas a líquido - diesel ultimate)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
 #: build/trans_presets.java:1338
 msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
+msgstr "Diesel para Vehiculos pesados"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
 #: build/trans_presets.java:1339
 msgid "Octane 91"
-msgstr ""
+msgstr "91 octanos"
 
 #. item "Car/Fuel" check "Octane 91"
 #: build/trans_presets.java:1340
 msgid "Octane 95"
-msgstr ""
+msgstr "95 octanos"
 
 #. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
 msgid "Octane 98"
-msgstr ""
+msgstr "98 octanos"
 
 #. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
 msgid "Octane 100"
-msgstr ""
+msgstr "100 octanos"
 
 #. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
 msgid "E10 (10% Ethanol mix)"
-msgstr ""
+msgstr "E10 (mezcla ao 10% de etanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
 msgid "E85 (85% Ethanol mix)"
-msgstr ""
+msgstr "E85 (mezcla ao 85% de etanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
+msgstr "GLP (Gas licuado do petróleo)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
 msgid "CNG (Compressed Natural Gas)"
-msgstr ""
+msgstr "GCN(Gas Natural Comprimido)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
@@ -23056,5 +23125,5 @@
 #: build/trans_surveyor.java:24
 msgid "Parking"
-msgstr ""
+msgstr "Aparcamento"
 
 #. item "Car/Parking"
@@ -23063,5 +23132,5 @@
 #: build/trans_presets.java:1354
 msgid "Edit Parking"
-msgstr ""
+msgstr "Editar aparcamento"
 
 #. item "Car/Parking" text "Name"
@@ -23074,23 +23143,23 @@
 #: build/trans_presets.java:2731
 msgid "Reference number"
-msgstr ""
+msgstr "Número de referencia"
 
 #. item "Car/Parking" combo "Type"
 #: build/trans_presets.java:1358
 msgid "multi-storey"
-msgstr ""
+msgstr "de pisos"
 
 #: build/trans_presets.java:1358
 msgid "surface"
-msgstr ""
+msgstr "ao aire libre"
 
 #. item "Man Made/Pipeline" combo "Location"
 #: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
-msgstr ""
+msgstr "subterráneo"
 
 #: build/trans_presets.java:1359
 msgid "Park and Ride"
-msgstr ""
+msgstr "Aparcamento disuasorio (Park & Ride)"
 
 #. item "Tourism/Information Terminal" text "Reference number"
@@ -23100,47 +23169,47 @@
 #: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
-msgstr ""
+msgstr "De pago"
 
 #. <space />
 #: build/trans_presets.java:1362
 msgid "Capacity (overall)"
-msgstr ""
+msgstr "Capacidade (en xeral)"
 
 #. item "Car/Parking" text "Capacity (overall)"
 #: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
-msgstr ""
+msgstr "Prazas para Personas de Movilidad Reducida"
 
 #: build/trans_presets.java:1364
 msgid "Spaces for Women"
-msgstr ""
+msgstr "Espazos para a muller"
 
 #: build/trans_presets.java:1365
 msgid "Spaces for Parents"
-msgstr ""
+msgstr "Espazos para os páis"
 
 #: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
+msgstr "Ver na wiki para outra capacidade"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
 #: build/trans_presets.java:1368
 msgid "Wash"
-msgstr ""
+msgstr "Limpeza"
 
 #. item "Car/Wash"
 #: build/trans_presets.java:1369
 msgid "Edit Car Wash"
-msgstr ""
+msgstr "Editar lavadoiro de vehículos"
 
 #. item "Car/Wash" text "Operator"
 #: build/trans_presets.java:1374
 msgid "Repair"
-msgstr ""
+msgstr "Taller"
 
 #. item "Car/Repair"
 #: build/trans_presets.java:1375
 msgid "Edit Car Repair"
-msgstr ""
+msgstr "Editar taller"
 
 #. item "Car/Repair" text "Operator"
@@ -23148,5 +23217,5 @@
 #: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
-msgstr ""
+msgstr "Alquiler"
 
 #. item "Car/Rental"
@@ -23155,10 +23224,10 @@
 #: build/trans_presets.java:1383
 msgid "Edit Car Rental"
-msgstr ""
+msgstr "Editar alquiler de automóviles"
 
 #. item "Car/Rental" text "Operator"
 #: build/trans_presets.java:1388
 msgid "Sharing"
-msgstr ""
+msgstr "Compartindo"
 
 #. item "Car/Sharing"
@@ -23166,5 +23235,5 @@
 #: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
-msgstr ""
+msgstr "Editar automóviles compartidos"
 
 #. item "Bicycle/Parking"
@@ -23172,10 +23241,10 @@
 #: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
-msgstr ""
+msgstr "Editar aparcamiento para bicicletas"
 
 #. item "Bicycle/Parking" text "Name"
 #: build/trans_presets.java:1402
 msgid "Capacity"
-msgstr ""
+msgstr "Capacidade"
 
 #. item "Bicycle/Rental"
@@ -23184,5 +23253,5 @@
 #: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
-msgstr ""
+msgstr "Editar alquiler de bicicletas"
 
 #. group "Public Transport"
@@ -23190,5 +23259,5 @@
 msgctxt "railway"
 msgid "Station"
-msgstr ""
+msgstr "Estación"
 
 #. item "Public Transport/Station"
@@ -23198,10 +23267,10 @@
 msgctxt "railway"
 msgid "Edit Station"
-msgstr ""
+msgstr "Editar Estación"
 
 #. item "Public Transport/Station" text "Name"
 #: build/trans_presets.java:1421
 msgid "UIC-Reference"
-msgstr ""
+msgstr "UIC-Referencia"
 
 #. item "Public Transport/Station" text "UIC-Reference"
@@ -23209,5 +23278,5 @@
 #: build/trans_presets.java:1424
 msgid "Railway Halt"
-msgstr ""
+msgstr "Apeadeiro de ferrocarril"
 
 #. item "Public Transport/Railway Halt"
@@ -23215,5 +23284,5 @@
 #: build/trans_presets.java:1426
 msgid "Edit Halt"
-msgstr ""
+msgstr "Editar apeadeiro"
 
 #. item "Public Transport/Railway Halt" text "Name"
@@ -23221,5 +23290,5 @@
 #: build/trans_presets.java:1433
 msgid "Tram Stop"
-msgstr ""
+msgstr "Parada de tranvía"
 
 #. item "Public Transport/Tram Stop"
@@ -23228,5 +23297,5 @@
 #: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
-msgstr ""
+msgstr "Editar parada de tranvía"
 
 #. item "Public Transport/Tram Stop" text "Name"
@@ -23234,5 +23303,5 @@
 #: build/trans_presets.java:1443
 msgid "Railway Platform"
-msgstr ""
+msgstr "Andén de ferrocarril"
 
 #. item "Public Transport/Railway Platform"
@@ -23241,5 +23310,5 @@
 #: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
-msgstr ""
+msgstr "Editar andén de ferrocarril"
 
 #. item "Public Transport/Railway Platform" label "Edit Railway Platform"
@@ -23251,5 +23320,5 @@
 #: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
-msgstr ""
+msgstr "Referencia (número de pista)"
 
 #. item "Public Transport/Railway Platform" text "Width (meters)"
@@ -23257,10 +23326,10 @@
 #: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
-msgstr ""
+msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
 #: build/trans_presets.java:1453
 msgid "Subway Entrance"
-msgstr ""
+msgstr "Boca de metro"
 
 #. item "Public Transport/Subway Entrance"
@@ -23269,10 +23338,10 @@
 #: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
-msgstr ""
+msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
 #: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
-msgstr ""
+msgstr "Cadeira de rodas"
 
 #. item "Public Transport/Subway Entrance" check "Bicycle"
@@ -23281,5 +23350,5 @@
 #: build/trans_presets.java:1466
 msgid "Bus Station"
-msgstr ""
+msgstr "Estación de autobús"
 
 #. item "Public Transport/Bus Station"
@@ -23288,5 +23357,5 @@
 #: build/trans_presets.java:1469
 msgid "Edit Bus Station"
-msgstr ""
+msgstr "Editar estación de autobús"
 
 #. item "Public Transport/Bus Station" text "Name"
@@ -23294,5 +23363,5 @@
 #: build/trans_presets.java:1475
 msgid "Bus Stop"
-msgstr ""
+msgstr "Parada de autobús"
 
 #. item "Public Transport/Bus Stop"
@@ -23302,5 +23371,5 @@
 #: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
-msgstr ""
+msgstr "Editar parada de autobús"
 
 #. item "Public Transport/Bus Stop" text "Name"
@@ -23310,5 +23379,5 @@
 #: build/trans_presets.java:2491
 msgid "Shelter"
-msgstr ""
+msgstr "Refuxio"
 
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
@@ -23316,19 +23385,19 @@
 #: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
-msgstr ""
+msgstr "Banco"
 
 #: build/trans_presets.java:1486
 msgid "Tactile Paving"
-msgstr ""
+msgstr "Pavimento táctil"
 
 #. </optional>
 #: build/trans_presets.java:1490
 msgid "Bus Platform"
-msgstr ""
+msgstr "Andén de autobús"
 
 #. item "Public Transport/Bus Platform"
 #: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
-msgstr ""
+msgstr "Editar andén de autobús"
 
 #. item "Public Transport/Bus Platform" check "Area"
@@ -23336,5 +23405,5 @@
 #: build/trans_presets.java:1499
 msgid "Taxi"
-msgstr ""
+msgstr "Taxi"
 
 #. item "Public Transport/Taxi"
@@ -23342,5 +23411,5 @@
 #: build/trans_presets.java:1501
 msgid "Edit Taxi station"
-msgstr ""
+msgstr "Editar parada de taxi"
 
 #. item "Public Transport/Taxi" text "Name"
@@ -23348,10 +23417,10 @@
 #: build/trans_presets.java:1507
 msgid "Airport"
-msgstr ""
+msgstr "Aeroporto"
 
 #. group "Airport"
 #: build/trans_presets.java:1508
 msgid "Airport Ground"
-msgstr ""
+msgstr "Campo de aviación"
 
 #. item "Airport/Airport Ground"
@@ -23359,5 +23428,5 @@
 #: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
-msgstr ""
+msgstr "Editar campo de aviación"
 
 #. item "Airport/Airport Ground" text "Name"
@@ -23365,10 +23434,10 @@
 #: build/trans_presets.java:1514
 msgid "IATA"
-msgstr ""
+msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
 #: build/trans_presets.java:1515
 msgid "ICAO"
-msgstr ""
+msgstr "ICAO"
 
 #. item "Airport/Airport Ground" text "ICAO"
@@ -23377,5 +23446,5 @@
 #: build/trans_presets.java:1519
 msgid "Runway"
-msgstr ""
+msgstr "Pista"
 
 #. item "Airport/Runway"
@@ -23383,5 +23452,5 @@
 #: build/trans_presets.java:1521
 msgid "Edit Runway"
-msgstr ""
+msgstr "Editar pista"
 
 #. item "Airport/Runway" text "Reference"
@@ -23389,5 +23458,5 @@
 #: build/trans_presets.java:1527
 msgid "Taxiway"
-msgstr ""
+msgstr "Pista de rodaxe"
 
 #. item "Airport/Taxiway"
@@ -23395,5 +23464,5 @@
 #: build/trans_presets.java:1529
 msgid "Edit Taxiway"
-msgstr ""
+msgstr "Editar pista de rodaxe"
 
 #. item "Airport/Taxiway" text "Reference"
@@ -23401,5 +23470,5 @@
 #: build/trans_presets.java:1535
 msgid "Helipad"
-msgstr ""
+msgstr "Heliporto"
 
 #. item "Airport/Helipad"
@@ -23407,5 +23476,5 @@
 #: build/trans_presets.java:1537
 msgid "Edit Helipad"
-msgstr ""
+msgstr "Editar heliporto"
 
 #. item "Airport/Helipad" text "Reference"
@@ -23415,5 +23484,5 @@
 #: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
-msgstr ""
+msgstr "Apron"
 
 #. item "Airport/Apron" label "Apron"
@@ -23423,5 +23492,5 @@
 #: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
-msgstr ""
+msgstr "Hangar"
 
 #. item "Airport/Hangar" label "Hangar"
@@ -23433,5 +23502,5 @@
 #: build/trans_presets.java:2365
 msgid "Beacon"
-msgstr ""
+msgstr "Baliza"
 
 #. item "Airport/Beacon" label "Beacon"
@@ -23441,5 +23510,5 @@
 #: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
-msgstr ""
+msgstr "Manga de vento"
 
 #. item "Airport/Windsock" label "Windsock"
@@ -23448,5 +23517,5 @@
 #: build/trans_presets.java:1564
 msgid "Terminal"
-msgstr ""
+msgstr "Terminal"
 
 #. item "Airport/Terminal"
@@ -23454,5 +23523,5 @@
 #: build/trans_presets.java:1566
 msgid "Edit Terminal"
-msgstr ""
+msgstr "Editar Terminal"
 
 #. item "Airport/Gate"
@@ -23460,15 +23529,15 @@
 #: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
-msgstr ""
+msgstr "Editar Porta de Terminal"
 
 #. item "Airport/Gate" text "Reference"
 #: build/trans_presets.java:1578
 msgid "Travel"
-msgstr ""
+msgstr "Viaxes"
 
 #. group "Travel"
 #: build/trans_presets.java:1579
 msgid "Accomodation"
-msgstr ""
+msgstr "Aloxamiento"
 
 #. group "Travel/Accomodation"
@@ -23480,5 +23549,5 @@
 #: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
-msgstr ""
+msgstr "Hotel"
 
 #. item "Travel/Accomodation/Hotel"
@@ -23487,15 +23556,15 @@
 #: build/trans_presets.java:1583
 msgid "Edit Hotel"
-msgstr ""
+msgstr "Editar hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
 #: build/trans_presets.java:1586
 msgid "Stars"
-msgstr ""
+msgstr "Estrelas"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
 #: build/trans_presets.java:1588
 msgid "Motel"
-msgstr ""
+msgstr "Motel"
 
 #. item "Travel/Accomodation/Motel"
@@ -23503,20 +23572,20 @@
 #: build/trans_presets.java:1590
 msgid "Edit Motel"
-msgstr ""
+msgstr "Editar motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
 #: build/trans_presets.java:1594
 msgid "Guest House"
-msgstr ""
+msgstr "Pensión"
 
 #. item "Travel/Accomodation/Guest House"
 #: build/trans_presets.java:1595
 msgid "Edit Guest House"
-msgstr ""
+msgstr "Editar pensión"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
 #: build/trans_presets.java:1599
 msgid "Chalet"
-msgstr ""
+msgstr "Cabaña ou bungalow"
 
 #. item "Travel/Accomodation/Chalet"
@@ -23524,10 +23593,10 @@
 #: build/trans_presets.java:1601
 msgid "Edit Chalet"
-msgstr ""
+msgstr "Editar cabaña ou bungalow"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
 #: build/trans_presets.java:1605
 msgid "Hostel"
-msgstr ""
+msgstr "Albergue"
 
 #. item "Travel/Accomodation/Hostel"
@@ -23535,30 +23604,30 @@
 #: build/trans_presets.java:1607
 msgid "Edit Hostel"
-msgstr ""
+msgstr "Editar albergue"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
 #: build/trans_presets.java:1611
 msgid "Alpine Hut"
-msgstr ""
+msgstr "Cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut"
 #: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
-msgstr ""
+msgstr "Editar cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
 #: build/trans_presets.java:1617
 msgid "Caravan Site"
-msgstr ""
+msgstr "Zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
-msgstr ""
+msgstr "Editar zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
 #: build/trans_presets.java:1622
 msgid "Camping Site"
-msgstr ""
+msgstr "Lugar de acampada"
 
 #. item "Travel/Accomodation/Camping Site"
@@ -23566,10 +23635,10 @@
 #: build/trans_presets.java:1624
 msgid "Edit Camping Site"
-msgstr ""
+msgstr "Editar lugar de acampada"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
 #: build/trans_presets.java:1629
 msgid "Food+Drinks"
-msgstr ""
+msgstr "Comida+Bebidas"
 
 #. group "Food+Drinks"
@@ -23580,5 +23649,5 @@
 #: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
-msgstr ""
+msgstr "Restaurante"
 
 #. item "Food+Drinks/Restaurant"
@@ -23586,5 +23655,5 @@
 #: build/trans_presets.java:1632
 msgid "Edit Restaurant"
-msgstr ""
+msgstr "Editar restaurante"
 
 #. item "Food+Drinks/Restaurant" text "Name"
@@ -23592,5 +23661,5 @@
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
-msgstr ""
+msgstr "Cociña"
 
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
@@ -23598,73 +23667,73 @@
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
-msgstr ""
+msgstr "italiano"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
-msgstr ""
+msgstr "chino"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
-msgstr ""
+msgstr "pizzería"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
-msgstr ""
+msgstr "hamburguesería"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
-msgstr ""
+msgstr "grego"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
-msgstr ""
+msgstr "alemán"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
-msgstr ""
+msgstr "india"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
-msgstr ""
+msgstr "rexional"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
-msgstr ""
+msgstr "kebab"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
-msgstr ""
+msgstr "turco"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
-msgstr ""
+msgstr "asiático"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
-msgstr ""
+msgstr "tailandés"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
-msgstr ""
+msgstr "mexicano"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
-msgstr ""
+msgstr "xaponés"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
-msgstr ""
+msgstr "francés"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
-msgstr ""
+msgstr "sandwich"
 
 #: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
-msgstr ""
+msgstr "sushi"
 
 #: build/trans_presets.java:1638
 msgid "Fast Food"
-msgstr ""
+msgstr "Comida rápida"
 
 #. item "Food+Drinks/Fast Food"
@@ -23672,17 +23741,17 @@
 #: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
-msgstr ""
+msgstr "Editar establecemento de comida rápida"
 
 #: build/trans_presets.java:1643
 msgid "fish_and_chips"
-msgstr ""
+msgstr "fish_and_chips (patacas e pescado fritos)"
 
 #: build/trans_presets.java:1643
 msgid "chicken"
-msgstr ""
+msgstr "polo"
 
 #: build/trans_presets.java:1646
 msgid "Cafe"
-msgstr ""
+msgstr "Cafetería"
 
 #. item "Food+Drinks/Cafe"
@@ -23690,9 +23759,9 @@
 #: build/trans_presets.java:1648
 msgid "Edit Cafe"
-msgstr ""
+msgstr "Editar cafetería"
 
 #: build/trans_presets.java:1653
 msgid "Pub"
-msgstr ""
+msgstr "Pub"
 
 #. item "Food+Drinks/Pub"
@@ -23700,18 +23769,18 @@
 #: build/trans_presets.java:1655
 msgid "Edit Pub"
-msgstr ""
+msgstr "Editar pub"
 
 #: build/trans_presets.java:1660
 msgid "Biergarten"
-msgstr ""
+msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
 #: build/trans_presets.java:1661
 msgid "Edit Biergarten"
-msgstr ""
+msgstr "Editar biergarten"
 
 #: build/trans_presets.java:1666
 msgid "Bar"
-msgstr ""
+msgstr "Bar"
 
 #. item "Food+Drinks/Bar"
@@ -23719,9 +23788,9 @@
 #: build/trans_presets.java:1668
 msgid "Edit Bar"
-msgstr ""
+msgstr "Editar Bar"
 
 #: build/trans_presets.java:1673
 msgid "Nightclub"
-msgstr ""
+msgstr "Club nocturno"
 
 #. item "Food+Drinks/Nightclub"
@@ -23729,24 +23798,24 @@
 #: build/trans_presets.java:1675
 msgid "Edit Nightclub"
-msgstr ""
+msgstr "Editar club nocturno"
 
 #: build/trans_presets.java:1681
 msgid "Tourism"
-msgstr ""
+msgstr "Turismo"
 
 #. group "Tourism"
 #: build/trans_presets.java:1682
 msgid "Attraction"
-msgstr ""
+msgstr "Atracción"
 
 #. item "Tourism/Attraction"
 #: build/trans_presets.java:1683
 msgid "Edit Attraction"
-msgstr ""
+msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
 #: build/trans_presets.java:1688
 msgid "Museum"
-msgstr ""
+msgstr "Museo"
 
 #. item "Tourism/Museum"
@@ -23754,9 +23823,9 @@
 #: build/trans_presets.java:1690
 msgid "Edit Museum"
-msgstr ""
+msgstr "Editar museo"
 
 #: build/trans_presets.java:1695
 msgid "Zoo"
-msgstr ""
+msgstr "Zoo"
 
 #. item "Tourism/Zoo"
@@ -23765,9 +23834,9 @@
 #: build/trans_presets.java:1698
 msgid "Edit Zoo"
-msgstr ""
+msgstr "Editar zoo"
 
 #: build/trans_presets.java:1703
 msgid "Viewpoint"
-msgstr ""
+msgstr "Panorámica"
 
 #. item "Tourism/Viewpoint"
@@ -23775,24 +23844,24 @@
 #: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
-msgstr ""
+msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
 #: build/trans_presets.java:1708
 msgid "Look-Out Tower"
-msgstr ""
+msgstr "Torre de vixía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
 #: build/trans_presets.java:1710
 msgid "Theme Park"
-msgstr ""
+msgstr "Parque temático"
 
 #. item "Tourism/Theme Park"
 #: build/trans_presets.java:1711
 msgid "Edit Theme Park"
-msgstr ""
+msgstr "Editar parque temático"
 
 #: build/trans_presets.java:1716
 msgid "Artwork"
-msgstr ""
+msgstr "Gráficos"
 
 #. item "Tourism/Artwork"
@@ -23800,5 +23869,5 @@
 #: build/trans_presets.java:1718
 msgid "Edit Artwork"
-msgstr ""
+msgstr "Editar traballo artístico"
 
 #. item "Tourism/Artwork" text "Name"
@@ -23806,5 +23875,5 @@
 #: build/trans_presets.java:1723
 msgid "Information Office"
-msgstr ""
+msgstr "Oficina de información"
 
 #: build/trans_presets.java:1730
@@ -23815,10 +23884,10 @@
 #: build/trans_presets.java:1735
 msgid "Detail Grade"
-msgstr ""
+msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
 #: build/trans_presets.java:1735
 msgid "topo"
-msgstr ""
+msgstr "topográfico"
 
 #. color tertiary
@@ -23858,26 +23927,26 @@
 #: build/trans_style.java:665
 msgid "street"
-msgstr ""
+msgstr "rúa"
 
 #: build/trans_presets.java:1735
 msgid "scheme"
-msgstr ""
+msgstr "esquema"
 
 #: build/trans_presets.java:1736
 msgid "Shown Area"
-msgstr ""
+msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
 #: build/trans_presets.java:1736
 msgid "site"
-msgstr ""
+msgstr "lugar"
 
 #: build/trans_presets.java:1736
 msgid "city"
-msgstr ""
+msgstr "cidade"
 
 #: build/trans_presets.java:1736
 msgid "region"
-msgstr ""
+msgstr "rexión"
 
 #. item "Tourism/Other Information Points" text "Name"
@@ -23885,5 +23954,5 @@
 #: build/trans_presets.java:1797
 msgid "Closer Description"
-msgstr ""
+msgstr "Descripción detallada"
 
 #. item "Tourism/Map" text "Closer Description"
@@ -23893,5 +23962,5 @@
 #: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Rutas mostradas para:"
 
 #. item "Tourism/Map" label "Routes shown for:"
@@ -23899,5 +23968,5 @@
 #: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
-msgstr ""
+msgstr "Sendeiro"
 
 #. item "Tourism/Map" check "Hiking"
@@ -23906,5 +23975,5 @@
 #: build/trans_presets.java:1982
 msgid "Cycling"
-msgstr ""
+msgstr "Ciclismo"
 
 #. item "Tourism/Map" check "Cycling"
@@ -23912,5 +23981,5 @@
 #: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
-msgstr ""
+msgstr "Bicicleta de montaña"
 
 #. item "Tourism/Map" check "Mountainbiking"
@@ -23919,5 +23988,5 @@
 #: build/trans_presets.java:2036
 msgid "Skiing"
-msgstr ""
+msgstr "Esquí"
 
 #. item "Tourism/Map" check "Skiing"
@@ -23925,5 +23994,5 @@
 #: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
-msgstr ""
+msgstr "Equitación"
 
 #. item "Tourism/Map" check "Riding"
@@ -23931,46 +24000,46 @@
 #: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
-msgstr ""
+msgstr "...outro métodos de desprazamentos posibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
 #: build/trans_presets.java:1747
 msgid "Information Board"
-msgstr ""
+msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
 #: build/trans_presets.java:1752
 msgid "Board Content"
-msgstr ""
+msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
 #: build/trans_presets.java:1752
 msgid "notice"
-msgstr ""
+msgstr "aviso"
 
 #: build/trans_presets.java:1752
 msgid "history"
-msgstr ""
+msgstr "historial"
 
 #: build/trans_presets.java:1752
 msgid "nature"
-msgstr ""
+msgstr "natureza"
 
 #: build/trans_presets.java:1752
 msgid "wildlife"
-msgstr ""
+msgstr "vida salvaxe"
 
 #: build/trans_presets.java:1752
 msgid "plants"
-msgstr ""
+msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
 #: build/trans_presets.java:1755
 msgid "Guidepost"
-msgstr ""
+msgstr "Poste identificador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
 #: build/trans_presets.java:1770
 msgid "Information Terminal"
-msgstr ""
+msgstr "Punto de información"
 
 #. item "Tourism/Information Terminal" text "Name"
@@ -23978,29 +24047,29 @@
 #: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
-msgstr ""
+msgstr "Descripción detallada"
 
 #: build/trans_presets.java:1780
 msgid "Audioguide"
-msgstr ""
+msgstr "Audioguía"
 
 #. <space />
 #: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "¿Audioguía a través de teléfono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
 #: build/trans_presets.java:1791
 msgid "Phone number"
-msgstr ""
+msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
 #: build/trans_presets.java:1793
 msgid "Other Information Points"
-msgstr ""
+msgstr "Outros Puntos de Información"
 
 #. item "Tourism/Shelter"
 #: build/trans_presets.java:1801
 msgid "Edit Shelter"
-msgstr ""
+msgstr "Editar refuxio"
 
 #. item "Tourism/Shelter" text "Name"
@@ -24008,25 +24077,25 @@
 #: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
-msgstr ""
+msgstr "Cheminea"
 
 #. item "Tourism/Shelter" check "Fireplace"
 #: build/trans_presets.java:1806
 msgid "Picnic Site"
-msgstr ""
+msgstr "Zona de picnic"
 
 #. item "Tourism/Picnic Site"
 #: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
-msgstr ""
+msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
 #: build/trans_presets.java:1813
 msgid "Historic Places"
-msgstr ""
+msgstr "Lugares históricos"
 
 #. group "Historic Places"
 #: build/trans_presets.java:1814
 msgid "Castle"
-msgstr ""
+msgstr "Castelo"
 
 #. item "Historic Places/Castle"
@@ -24035,19 +24104,19 @@
 #: build/trans_presets.java:1817
 msgid "Edit Castle"
-msgstr ""
+msgstr "Editar castelo"
 
 #. item "Historic Places/Castle" text "Name"
 #: build/trans_presets.java:1821
 msgid "Ruins"
-msgstr ""
+msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
 #: build/trans_presets.java:1822
 msgid "Edit Ruins"
-msgstr ""
+msgstr "Editar ruínas"
 
 #: build/trans_presets.java:1827
 msgid "Archaeological Site"
-msgstr ""
+msgstr "Lugar arqueolóxico"
 
 #. item "Historic Places/Archaeological Site"
@@ -24056,9 +24125,9 @@
 #: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
-msgstr ""
+msgstr "Editar lugar arqueolóxico"
 
 #: build/trans_presets.java:1835
 msgid "Battlefield"
-msgstr ""
+msgstr "Campo de batalla"
 
 #. item "Historic Places/Battlefield"
@@ -24066,10 +24135,10 @@
 #: build/trans_presets.java:1837
 msgid "Edit Battlefield"
-msgstr ""
+msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
 #: build/trans_presets.java:1841
 msgid "Palaeontological Site"
-msgstr ""
+msgstr "Sitio paleontolóxico"
 
 #. item "Historic Places/Palaeontological Site"
@@ -24077,5 +24146,5 @@
 #: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
-msgstr ""
+msgstr "Editar sitio paleontolóxico"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
@@ -24083,15 +24152,15 @@
 #: build/trans_presets.java:1848
 msgid "Monument"
-msgstr ""
+msgstr "Monumento"
 
 #. item "Historic Places/Monument"
 #: build/trans_presets.java:1849
 msgid "Edit Monument"
-msgstr ""
+msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
 #: build/trans_presets.java:1853
 msgid "Memorial"
-msgstr ""
+msgstr "Monumento conmemorativo"
 
 #. item "Historic Places/Memorial"
@@ -24099,15 +24168,15 @@
 #: build/trans_presets.java:1855
 msgid "Edit Memorial"
-msgstr ""
+msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
 #: build/trans_presets.java:1859
 msgid "Wayside Cross"
-msgstr ""
+msgstr "Cruceiro"
 
 #. item "Historic Places/Wayside Cross"
 #: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
-msgstr ""
+msgstr "Editar cruceiro"
 
 #. item "Historic Places/Wayside Cross" text "Name"
@@ -24134,20 +24203,20 @@
 #: build/trans_presets.java:1875
 msgid "Leisure"
-msgstr ""
+msgstr "Ocio"
 
 #. group "Leisure"
 #: build/trans_presets.java:1876
 msgid "Water Park"
-msgstr ""
+msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
 #: build/trans_presets.java:1877
 msgid "Edit Water Park"
-msgstr ""
+msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
 #: build/trans_presets.java:1881
 msgid "Playground"
-msgstr ""
+msgstr "Zona de xogos"
 
 #. item "Leisure/Playground"
@@ -24155,35 +24224,35 @@
 #: build/trans_presets.java:1883
 msgid "Edit Playground"
-msgstr ""
+msgstr "Editar zona de xogos"
 
 #. item "Leisure/Playground" text "Name"
 #: build/trans_presets.java:1887
 msgid "Fishing"
-msgstr ""
+msgstr "Pesca"
 
 #. item "Leisure/Fishing"
 #: build/trans_presets.java:1888
 msgid "Edit Fishing"
-msgstr ""
+msgstr "Editar pesca"
 
 #. item "Leisure/Fishing" text "Name"
 #: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
-msgstr ""
+msgstr "Deportes"
 
 #. group "Sports"
 #: build/trans_presets.java:1895
 msgid "Sport Facilities"
-msgstr ""
+msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
 #: build/trans_presets.java:1896
 msgid "Stadium"
-msgstr ""
+msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
 #: build/trans_presets.java:1897
 msgid "Edit Stadium"
-msgstr ""
+msgstr "Editar estadio"
 
 #. item "Sports/Sport Facilities/Stadium" text "Name"
@@ -24198,5 +24267,5 @@
 #: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
-msgstr ""
+msgstr "seleccionar deporte:"
 
 #. item "Sports/Sport Facilities/Stadium" label "select sport:"
@@ -24613,5 +24682,5 @@
 #: build/trans_style.java:4073
 msgid "sport"
-msgstr ""
+msgstr "deporte"
 
 #. item "Sports/Sport Facilities/Stadium" combo "sport"
@@ -24622,30 +24691,30 @@
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
-msgstr ""
+msgstr "diversos"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
-msgstr ""
+msgstr "tiro con arco"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
-msgstr ""
+msgstr "atletismo"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
-msgstr ""
+msgstr "fútbol australiano"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
-msgstr ""
+msgstr "béisbol"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
-msgstr ""
+msgstr "baloncesto"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
@@ -24657,189 +24726,189 @@
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
-msgstr ""
+msgstr "bolos"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
-msgstr ""
+msgstr "piragua"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
-msgstr ""
+msgstr "escalada"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
-msgstr ""
+msgstr "cricket"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
-msgstr ""
+msgstr "Cricket con redes"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
-msgstr ""
+msgstr "croquet"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
-msgstr ""
+msgstr "ciclismo"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
-msgstr ""
+msgstr "carreira de cans"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
-msgstr ""
+msgstr "hípica"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
-msgstr ""
+msgstr "fútbol"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
-msgstr ""
+msgstr "golf"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
-msgstr ""
+msgstr "ximnasia"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
-msgstr ""
+msgstr "hockey"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
-msgstr ""
+msgstr "carreira de cabalos"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
-msgstr ""
+msgstr "motor"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
-msgstr ""
+msgstr "pelota vasca"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
-msgstr ""
+msgstr "raqueta"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
-msgstr ""
+msgstr "rugby"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
-msgstr ""
+msgstr "tiro"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
-msgstr ""
+msgstr "monopatín"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
-msgstr ""
+msgstr "patinaxe"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
-msgstr ""
+msgstr "esquí"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
-msgstr ""
+msgstr "Fútbol"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
-msgstr ""
+msgstr "natación"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
-msgstr ""
+msgstr "tenis de mesa"
 
 #: build/trans_presets.java:1903 build/trans_presets.java:1912
 #: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
-msgstr ""
+msgstr "tenis"
 
 #: build/trans_presets.java:1905
 msgid "Sports Centre"
-msgstr ""
+msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
 #: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
-msgstr ""
+msgstr "Editar polideportivo"
 
 #: build/trans_presets.java:1914
 msgid "Pitch"
-msgstr ""
+msgstr "Cancha de xogo"
 
 #. item "Sports/Sport Facilities/Pitch"
 #: build/trans_presets.java:1915
 msgid "Edit Pitch"
-msgstr ""
+msgstr "Editar cancha de xogo"
 
 #: build/trans_presets.java:1923
 msgid "Racetrack"
-msgstr ""
+msgstr "Pista de carreiras"
 
 #. item "Sports/Sport Facilities/Racetrack"
 #: build/trans_presets.java:1924
 msgid "Edit Racetrack"
-msgstr ""
+msgstr "Editar pista de carreiras"
 
 #: build/trans_presets.java:1932
 msgid "Golf Course"
-msgstr ""
+msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
 #: build/trans_presets.java:1933
 msgid "Edit Golf Course"
-msgstr ""
+msgstr "Editar campo de golf"
 
 #: build/trans_presets.java:1938
 msgid "Miniature Golf"
-msgstr ""
+msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
 #: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
-msgstr ""
+msgstr "Editar mini golf"
 
 #: build/trans_presets.java:1945
 msgid "Sport"
-msgstr ""
+msgstr "Deportes"
 
 #. group "Sport"
 #: build/trans_presets.java:1946
 msgid "Multi"
-msgstr ""
+msgstr "Múltiple"
 
 #. item "Sport/Multi"
 #: build/trans_presets.java:1947
 msgid "Edit Multi"
-msgstr ""
+msgstr "Editar multi"
 
 #. item "Sport/Multi" text "Name"
@@ -24947,5 +25016,5 @@
 #: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
-msgstr ""
+msgstr "cancha de xogo"
 
 #: build/trans_presets.java:1950 build/trans_presets.java:1956
@@ -24967,5 +25036,5 @@
 #: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
-msgstr ""
+msgstr "Polideportivo"
 
 #: build/trans_presets.java:1950 build/trans_presets.java:1956
@@ -24987,5 +25056,5 @@
 #: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
-msgstr ""
+msgstr "Estadio"
 
 #: build/trans_presets.java:1950 build/trans_presets.java:1956
@@ -25007,5 +25076,5 @@
 #: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
-msgstr ""
+msgstr "pista"
 
 #: build/trans_presets.java:1952
@@ -25020,114 +25089,114 @@
 #: build/trans_presets.java:1958
 msgid "Athletics"
-msgstr ""
+msgstr "Atletismo"
 
 #. item "Sport/Athletics"
 #: build/trans_presets.java:1959
 msgid "Edit Athletics"
-msgstr ""
+msgstr "Editar atletismo"
 
 #: build/trans_presets.java:1964
 msgid "Archery"
-msgstr ""
+msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
 #: build/trans_presets.java:1965
 msgid "Edit Archery"
-msgstr ""
+msgstr "Editar tiro con arco"
 
 #: build/trans_presets.java:1970
 msgid "Climbing"
-msgstr ""
+msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
 #: build/trans_presets.java:1971
 msgid "Edit Climbing"
-msgstr ""
+msgstr "Editar alpinismo"
 
 #: build/trans_presets.java:1976
 msgid "Canoeing"
-msgstr ""
+msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
 #: build/trans_presets.java:1977
 msgid "Edit Canoeing"
-msgstr ""
+msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
 #: build/trans_presets.java:1983
 msgid "Edit Cycling"
-msgstr ""
+msgstr "Editar ciclismo"
 
 #: build/trans_presets.java:1988
 msgid "Dog Racing"
-msgstr ""
+msgstr "Carreiras de cans"
 
 #. item "Sport/Dog Racing"
 #: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
-msgstr ""
+msgstr "Editar carreiras de cans"
 
 #: build/trans_presets.java:1994
 msgid "Equestrian"
-msgstr ""
+msgstr "Hípica"
 
 #. item "Sport/Equestrian"
 #: build/trans_presets.java:1995
 msgid "Edit Equestrian"
-msgstr ""
+msgstr "Editar hípica"
 
 #: build/trans_presets.java:2000
 msgid "Horse Racing"
-msgstr ""
+msgstr "Carreira de cabalos"
 
 #. item "Sport/Horse Racing"
 #: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
-msgstr ""
+msgstr "Editar carreiras de caballos"
 
 #: build/trans_presets.java:2006
 msgid "Gymnastics"
-msgstr ""
+msgstr "Ximnasia"
 
 #. item "Sport/Gymnastics"
 #: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
-msgstr ""
+msgstr "Editar Ximnasia"
 
 #: build/trans_presets.java:2012
 msgid "Motor Sports"
-msgstr ""
+msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
 #: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
-msgstr ""
+msgstr "Editar deportes de motor"
 
 #: build/trans_presets.java:2018
 msgid "Skating"
-msgstr ""
+msgstr "Patinaxe"
 
 #. item "Sport/Skating"
 #: build/trans_presets.java:2019
 msgid "Edit Skating"
-msgstr ""
+msgstr "Editar patinaxe"
 
 #: build/trans_presets.java:2024
 msgid "Skateboard"
-msgstr ""
+msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
 #: build/trans_presets.java:2025
 msgid "Edit Skateboard"
-msgstr ""
+msgstr "Editar monopatín"
 
 #: build/trans_presets.java:2030
 msgid "Swimming"
-msgstr ""
+msgstr "Natación"
 
 #. item "Sport/Swimming"
 #: build/trans_presets.java:2031
 msgid "Edit Swimming"
-msgstr ""
+msgstr "Editar natación"
 
 #. item "Sport/Skiing"
@@ -25135,52 +25204,52 @@
 #: build/trans_presets.java:2038
 msgid "Edit Skiing"
-msgstr ""
+msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
 #: build/trans_presets.java:2041
 msgid "Piste type"
-msgstr ""
+msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
 #: build/trans_presets.java:2041
 msgid "downhill"
-msgstr ""
+msgstr "de descenso"
 
 #: build/trans_presets.java:2041
 msgid "nordic"
-msgstr ""
+msgstr "nórdico"
 
 #: build/trans_presets.java:2041
 msgid "snow_park"
-msgstr ""
+msgstr "parque de snowboard"
 
 #: build/trans_presets.java:2042
 msgid "Difficulty"
-msgstr ""
+msgstr "Dificultade"
 
 #. item "Sport/Skiing" combo "Difficulty"
 #: build/trans_presets.java:2042
 msgid "novice"
-msgstr ""
+msgstr "novato"
 
 #: build/trans_presets.java:2042
 msgid "easy"
-msgstr ""
+msgstr "fácil"
 
 #: build/trans_presets.java:2042
 msgid "advanced"
-msgstr ""
+msgstr "avanzado"
 
 #: build/trans_presets.java:2042
 msgid "expert"
-msgstr ""
+msgstr "experto"
 
 #: build/trans_presets.java:2042
 msgid "freeride"
-msgstr ""
+msgstr "fora da pista"
 
 #: build/trans_presets.java:2045
 msgid "Shooting"
-msgstr ""
+msgstr "Tiro"
 
 #. item "Sport/Shooting"
@@ -25188,177 +25257,177 @@
 #: build/trans_presets.java:2047
 msgid "Edit Shooting"
-msgstr ""
+msgstr "Editar tiro"
 
 #: build/trans_presets.java:2053
 msgid "Sport (Ball)"
-msgstr ""
+msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
 #: build/trans_presets.java:2054
 msgid "Soccer"
-msgstr ""
+msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
 #: build/trans_presets.java:2055
 msgid "Edit Soccer"
-msgstr ""
+msgstr "Editar fútbol"
 
 #: build/trans_presets.java:2060
 msgid "Football"
-msgstr ""
+msgstr "Fútbol americano"
 
 #. item "Sport (Ball)/Football"
 #: build/trans_presets.java:2061
 msgid "Edit Football"
-msgstr ""
+msgstr "Editar fútbol americano"
 
 #: build/trans_presets.java:2066
 msgid "Australian Football"
-msgstr ""
+msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
 #: build/trans_presets.java:2067
 msgid "Edit Australian Football"
-msgstr ""
+msgstr "Editar fútbol australiano"
 
 #: build/trans_presets.java:2072
 msgid "Baseball"
-msgstr ""
+msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
 #: build/trans_presets.java:2073
 msgid "Edit Baseball"
-msgstr ""
+msgstr "Editar béisbol"
 
 #: build/trans_presets.java:2078
 msgid "Basketball"
-msgstr ""
+msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
 #: build/trans_presets.java:2079
 msgid "Edit Basketball"
-msgstr ""
+msgstr "Editar baloncesto"
 
 #: build/trans_presets.java:2084
 msgid "Golf"
-msgstr ""
+msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
 #: build/trans_presets.java:2085
 msgid "Edit Golf"
-msgstr ""
+msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
 #: build/trans_presets.java:2088
 msgid "golf_course"
-msgstr ""
+msgstr "campo de golf"
 
 #: build/trans_presets.java:2090
 msgid "Boule"
-msgstr ""
+msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
 #: build/trans_presets.java:2091
 msgid "Edit Boule"
-msgstr ""
+msgstr "Editar boule"
 
 #: build/trans_presets.java:2096
 msgid "Bowls"
-msgstr ""
+msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
 msgid "Edit Bowls"
-msgstr ""
+msgstr "Editar bolos"
 
 #: build/trans_presets.java:2102
 msgid "Cricket"
-msgstr ""
+msgstr "Críket"
 
 #. item "Sport (Ball)/Cricket"
 #: build/trans_presets.java:2103
 msgid "Edit Cricket"
-msgstr ""
+msgstr "Edit críket"
 
 #: build/trans_presets.java:2108
 msgid "Cricket Nets"
-msgstr ""
+msgstr "Críket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
-msgstr ""
+msgstr "Editar críket con redes"
 
 #: build/trans_presets.java:2114
 msgid "Croquet"
-msgstr ""
+msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
 msgid "Edit Croquet"
-msgstr ""
+msgstr "Editar croquet"
 
 #: build/trans_presets.java:2120
 msgid "Hockey"
-msgstr ""
+msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
 #: build/trans_presets.java:2121
 msgid "Edit Hockey"
-msgstr ""
+msgstr "Editar hockey"
 
 #: build/trans_presets.java:2126
 msgid "Pelota"
-msgstr ""
+msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
 #: build/trans_presets.java:2127
 msgid "Edit Pelota"
-msgstr ""
+msgstr "Editar pelota vasca"
 
 #: build/trans_presets.java:2132
 msgid "Racquet"
-msgstr ""
+msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
 msgid "Edit Racquet"
-msgstr ""
+msgstr "Editar raqueta"
 
 #: build/trans_presets.java:2138
 msgid "Rugby"
-msgstr ""
+msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
 #: build/trans_presets.java:2139
 msgid "Edit Rugby"
-msgstr ""
+msgstr "Editar rugby"
 
 #: build/trans_presets.java:2144
 msgid "Table Tennis"
-msgstr ""
+msgstr "Ténis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
 #: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
-msgstr ""
+msgstr "Editar tenis de mesa"
 
 #: build/trans_presets.java:2150
 msgid "Tennis"
-msgstr ""
+msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
 #: build/trans_presets.java:2151
 msgid "Edit Tennis"
-msgstr ""
+msgstr "Editar tenis"
 
 #: build/trans_presets.java:2158
 msgid "Man-Made"
-msgstr ""
+msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
 #: build/trans_presets.java:2160
 msgid "Building"
-msgstr ""
+msgstr "Edificio"
 
 #. item "Man-Made/Buildings/Building"
@@ -25366,5 +25435,5 @@
 #: build/trans_presets.java:2163
 msgid "Public Building"
-msgstr ""
+msgstr "Edificio público"
 
 #. item "Man-Made/Buildings/Public Building"
@@ -25372,10 +25441,10 @@
 #: build/trans_presets.java:2165
 msgid "Edit Public Building"
-msgstr ""
+msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
 #: build/trans_presets.java:2169
 msgid "Town hall"
-msgstr ""
+msgstr "Casa do Concello"
 
 #. item "Man-Made/Buildings/Town hall"
@@ -25383,10 +25452,10 @@
 #: build/trans_presets.java:2171
 msgid "Edit Town hall"
-msgstr ""
+msgstr "Editar Casa do Concello"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
 #: build/trans_presets.java:2175
 msgid "Embassy"
-msgstr ""
+msgstr "Embaixada"
 
 #. item "Man-Made/Buildings/Embassy"
@@ -25394,10 +25463,10 @@
 #: build/trans_presets.java:2177
 msgid "Edit Embassy"
-msgstr ""
+msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
 #: build/trans_presets.java:2181
 msgid "Courthouse"
-msgstr ""
+msgstr "Xuzgado"
 
 #. item "Man-Made/Buildings/Courthouse"
@@ -25406,10 +25475,10 @@
 #: build/trans_presets.java:2184
 msgid "Edit Courthouse"
-msgstr ""
+msgstr "Editar xuzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
 #: build/trans_presets.java:2188
 msgid "Prison"
-msgstr ""
+msgstr "Prisión"
 
 #. item "Man-Made/Buildings/Prison"
@@ -25418,10 +25487,10 @@
 #: build/trans_presets.java:2191
 msgid "Edit Prison"
-msgstr ""
+msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
 #: build/trans_presets.java:2195
 msgid "Police"
-msgstr ""
+msgstr "Policía"
 
 #. item "Man-Made/Buildings/Police"
@@ -25431,10 +25500,10 @@
 #: build/trans_presets.java:2199
 msgid "Edit Police"
-msgstr ""
+msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
 #: build/trans_presets.java:2203
 msgid "Fire Station"
-msgstr ""
+msgstr "Parque de bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station"
@@ -25443,10 +25512,10 @@
 #: build/trans_presets.java:2206
 msgid "Edit Fire Station"
-msgstr ""
+msgstr "Editar parque de bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
 #: build/trans_presets.java:2210
 msgid "Post Office"
-msgstr ""
+msgstr "Oficina postal"
 
 #. item "Man-Made/Buildings/Post Office"
@@ -25454,5 +25523,5 @@
 #: build/trans_presets.java:2212
 msgid "Edit Post Office"
-msgstr ""
+msgstr "Editar oficina postal"
 
 #. item "Man-Made/Buildings/Post Office" text "Operator"
@@ -25460,15 +25529,15 @@
 #: build/trans_presets.java:2218
 msgid "Kindergarten"
-msgstr ""
+msgstr "Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
 #: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
-msgstr ""
+msgstr "Editar Xardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
 #: build/trans_presets.java:2223
 msgid "School"
-msgstr ""
+msgstr "Escola"
 
 #. item "Man-Made/Buildings/School"
@@ -25476,10 +25545,10 @@
 #: build/trans_presets.java:2225
 msgid "Edit School"
-msgstr ""
+msgstr "Editar escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
 #: build/trans_presets.java:2229
 msgid "University"
-msgstr ""
+msgstr "Universidade"
 
 #. item "Man-Made/Buildings/University"
@@ -25487,10 +25556,10 @@
 #: build/trans_presets.java:2231
 msgid "Edit University"
-msgstr ""
+msgstr "Editar universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
 #: build/trans_presets.java:2235
 msgid "College"
-msgstr ""
+msgstr "Instituto"
 
 #. item "Man-Made/Buildings/College"
@@ -25498,5 +25567,5 @@
 #: build/trans_presets.java:2237
 msgid "Edit College"
-msgstr ""
+msgstr "Editar instituto"
 
 #. item "Man-Made/Buildings/College" text "Name"
@@ -25504,5 +25573,5 @@
 #: build/trans_presets.java:2242
 msgid "Cinema"
-msgstr ""
+msgstr "Cine"
 
 #. item "Man-Made/Buildings/Cinema"
@@ -25511,10 +25580,10 @@
 #: build/trans_presets.java:2245
 msgid "Edit Cinema"
-msgstr ""
+msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
 #: build/trans_presets.java:2249
 msgid "Library"
-msgstr ""
+msgstr "Biblioteca"
 
 #. item "Man-Made/Buildings/Library"
@@ -25523,9 +25592,9 @@
 #: build/trans_presets.java:2252
 msgid "Edit Library"
-msgstr ""
+msgstr "Editar biblioteca"
 
 #: build/trans_presets.java:2257
 msgid "Arts Centre"
-msgstr ""
+msgstr "Centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre"
@@ -25533,10 +25602,10 @@
 #: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
-msgstr ""
+msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
 #: build/trans_presets.java:2263
 msgid "Theatre"
-msgstr ""
+msgstr "Teatro"
 
 #. item "Man-Made/Buildings/Theatre"
@@ -25545,10 +25614,10 @@
 #: build/trans_presets.java:2266
 msgid "Edit Theatre"
-msgstr ""
+msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
 #: build/trans_presets.java:2270
 msgid "Place of Worship"
-msgstr ""
+msgstr "Lugar de culto"
 
 #. item "Man-Made/Buildings/Place of Worship"
@@ -25558,5 +25627,5 @@
 #: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
-msgstr ""
+msgstr "Editar lugar de culto"
 
 #. item "Man-Made/Buildings/Place of Worship" text "Name"
@@ -25566,5 +25635,5 @@
 #: build/trans_presets.java:3111
 msgid "Religion"
-msgstr ""
+msgstr "Relixión"
 
 #. item "Man-Made/Buildings/Place of Worship" combo "Religion"
@@ -25574,65 +25643,65 @@
 #: build/trans_presets.java:3111
 msgid "bahai"
-msgstr ""
+msgstr "bahaísta"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "buddhist"
-msgstr ""
+msgstr "budista"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "christian"
-msgstr ""
+msgstr "cristian"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "hindu"
-msgstr ""
+msgstr "hindú"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "jain"
-msgstr ""
+msgstr "jainista"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "jewish"
-msgstr ""
+msgstr "xudía"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "muslim"
-msgstr ""
+msgstr "musulmá"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "sikh"
-msgstr ""
+msgstr "sijista"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "spiritualist"
-msgstr ""
+msgstr "espiritualista"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "taoist"
-msgstr ""
+msgstr "taoista"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "unitarian"
-msgstr ""
+msgstr "unitarismo"
 
 #: build/trans_presets.java:2277 build/trans_presets.java:3102
 #: build/trans_presets.java:3111
 msgid "zoroastrian"
-msgstr ""
+msgstr "zoroástrica"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "Denomination"
-msgstr ""
+msgstr "Denominación"
 
 #. item "Man-Made/Buildings/Place of Worship" combo "Denomination"
@@ -25642,80 +25711,80 @@
 #: build/trans_presets.java:3112
 msgid "anglican"
-msgstr ""
+msgstr "anglicano"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "baptist"
-msgstr ""
+msgstr "baptista"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "catholic"
-msgstr ""
+msgstr "católico"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "evangelical"
-msgstr ""
+msgstr "evanxélico"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "jehovahs_witness"
-msgstr ""
+msgstr "testigos de Xenoveva"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "lutheran"
-msgstr ""
+msgstr "luterano"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "methodist"
-msgstr ""
+msgstr "metodista"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "mormon"
-msgstr ""
+msgstr "mormón"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "orthodox"
-msgstr ""
+msgstr "ortodoxo"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "pentecostal"
-msgstr ""
+msgstr "pentecostal"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "presbyterian"
-msgstr ""
+msgstr "presbiteriano"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "protestant"
-msgstr ""
+msgstr "protestante"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "quaker"
-msgstr ""
+msgstr "cuáquero"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "shia"
-msgstr ""
+msgstr "chiita"
 
 #: build/trans_presets.java:2278 build/trans_presets.java:3103
 #: build/trans_presets.java:3112
 msgid "sunni"
-msgstr ""
+msgstr "suní"
 
 #. <separator/>
 #: build/trans_presets.java:2282
 msgid "Addresses"
-msgstr ""
+msgstr "Enderezos"
 
 #. item "Man-Made/Buildings/Addresses"
@@ -25724,5 +25793,5 @@
 #: build/trans_presets.java:2285
 msgid "Edit Address Information"
-msgstr ""
+msgstr "Editar enderezos"
 
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
@@ -25730,5 +25799,5 @@
 #: build/trans_presets.java:2287
 msgid "House number"
-msgstr ""
+msgstr "Número de casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House number"
@@ -25736,25 +25805,25 @@
 #: build/trans_presets.java:2289
 msgid "House name"
-msgstr ""
+msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
 #: build/trans_presets.java:2290
 msgid "Street name"
-msgstr ""
+msgstr "Nome da rúa"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
 #: build/trans_presets.java:2291
 msgid "City name"
-msgstr ""
+msgstr "Nome da cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
 #: build/trans_presets.java:2292
 msgid "Post code"
-msgstr ""
+msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
 #: build/trans_presets.java:2293
 msgid "Country code"
-msgstr ""
+msgstr "Código do país"
 
 #. item "Man-Made/Buildings/Address Interpolation"
@@ -25763,5 +25832,5 @@
 #: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
-msgstr ""
+msgstr "Editar interpolación de direccións"
 
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
@@ -25769,61 +25838,61 @@
 #: build/trans_presets.java:2301
 msgid "Numbering scheme"
-msgstr ""
+msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
 #: build/trans_presets.java:2301
 msgid "odd"
-msgstr ""
+msgstr "impares"
 
 #: build/trans_presets.java:2301
 msgid "even"
-msgstr ""
+msgstr "pares"
 
 #: build/trans_presets.java:2301
 msgid "alphabetic"
-msgstr ""
+msgstr "alfabético"
 
 #: build/trans_presets.java:2304
 msgid "Man Made"
-msgstr ""
+msgstr "Feito polo home"
 
 #. group "Man Made"
 #: build/trans_presets.java:2305
 msgid "Works"
-msgstr ""
+msgstr "Fábrica"
 
 #. item "Man Made/Works"
 #: build/trans_presets.java:2306
 msgid "Edit Works"
-msgstr ""
+msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
 #: build/trans_presets.java:2310
 msgid "Tower"
-msgstr ""
+msgstr "Torre"
 
 #. item "Man Made/Tower"
 #: build/trans_presets.java:2311
 msgid "Edit Tower"
-msgstr ""
+msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
 #: build/trans_presets.java:2314
 msgid "Tower type"
-msgstr ""
+msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
 #: build/trans_presets.java:2314
 msgid "communication"
-msgstr ""
+msgstr "comunicación"
 
 #: build/trans_presets.java:2314
 msgid "observation"
-msgstr ""
+msgstr "observación"
 
 #. <optional>
 #: build/trans_presets.java:2316
 msgid "Height (meters)"
-msgstr ""
+msgstr "Altura (en metros)"
 
 #. item "Man Made/Tower" text "Operator"
@@ -25831,25 +25900,25 @@
 #: build/trans_presets.java:2320
 msgid "Water Tower"
-msgstr ""
+msgstr "Torre de auga"
 
 #. item "Man Made/Water Tower"
 #: build/trans_presets.java:2321
 msgid "Edit Water Tower"
-msgstr ""
+msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
 #: build/trans_presets.java:2325
 msgid "Gasometer"
-msgstr ""
+msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
 #: build/trans_presets.java:2326
 msgid "Edit Gasometer"
-msgstr ""
+msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
 #: build/trans_presets.java:2330
 msgid "Lighthouse"
-msgstr ""
+msgstr "Faro"
 
 #. item "Man Made/Lighthouse"
@@ -25857,10 +25926,10 @@
 #: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
-msgstr ""
+msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
 #: build/trans_presets.java:2336
 msgid "Windmill"
-msgstr ""
+msgstr "Muíño de vento"
 
 #. item "Man Made/Windmill"
@@ -25868,10 +25937,10 @@
 #: build/trans_presets.java:2338
 msgid "Edit Windmill"
-msgstr ""
+msgstr "Editar muíño de vento"
 
 #. item "Man Made/Windmill" text "Name"
 #: build/trans_presets.java:2342
 msgid "Pipeline"
-msgstr ""
+msgstr "Tubería"
 
 #. item "Man Made/Pipeline"
@@ -25880,41 +25949,41 @@
 #: build/trans_presets.java:2345
 msgid "Edit Pipeline"
-msgstr ""
+msgstr "Editar tubería"
 
 #: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
-msgstr ""
+msgstr "gas"
 
 #: build/trans_presets.java:2348
 msgid "heat"
-msgstr ""
+msgstr "térmico"
 
 #: build/trans_presets.java:2348
 msgid "oil"
-msgstr ""
+msgstr "aceite"
 
 #: build/trans_presets.java:2348
 msgid "sewage"
-msgstr ""
+msgstr "augas residuais"
 
 #: build/trans_presets.java:2348
 msgid "any substance"
-msgstr ""
+msgstr "calquer substancia"
 
 #: build/trans_presets.java:2349
 msgid "Location"
-msgstr ""
+msgstr "Localización"
 
 #: build/trans_presets.java:2349
 msgid "underwater"
-msgstr ""
+msgstr "sumerxido"
 
 #: build/trans_presets.java:2349
 msgid "overground"
-msgstr ""
+msgstr "na superficie"
 
 #: build/trans_presets.java:2351
 msgid "Wastewater Plant"
-msgstr ""
+msgstr "Depuradora"
 
 #. item "Man Made/Wastewater Plant"
@@ -25924,10 +25993,10 @@
 #: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
-msgstr ""
+msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
 #: build/trans_presets.java:2359
 msgid "Crane"
-msgstr ""
+msgstr "Grúa"
 
 #. item "Man Made/Crane"
@@ -25935,5 +26004,5 @@
 #: build/trans_presets.java:2361
 msgid "Edit Crane"
-msgstr ""
+msgstr "Editar grúa"
 
 #. item "Man Made/Beacon"
@@ -25941,10 +26010,10 @@
 #: build/trans_presets.java:2367
 msgid "Edit Beacon"
-msgstr ""
+msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
 #: build/trans_presets.java:2371
 msgid "Survey Point"
-msgstr ""
+msgstr "Vértice xeodésico"
 
 #. item "Man Made/Survey Point"
@@ -25952,10 +26021,10 @@
 #: build/trans_presets.java:2373
 msgid "Edit Survey Point"
-msgstr ""
+msgstr "Editar vértice xeodésico"
 
 #. item "Man Made/Survey Point" text "Name"
 #: build/trans_presets.java:2377
 msgid "Surveillance"
-msgstr ""
+msgstr "Cámara de vixilancia"
 
 #. item "Man Made/Surveillance"
@@ -25963,23 +26032,23 @@
 #: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
-msgstr ""
+msgstr "Editar cámara de vixilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
 #: build/trans_presets.java:2382
 msgid "indoor"
-msgstr ""
+msgstr "interiores"
 
 #: build/trans_presets.java:2382
 msgid "outdoor"
-msgstr ""
+msgstr "exteriores"
 
 #: build/trans_presets.java:2382
 msgid "public"
-msgstr ""
+msgstr "público"
 
 #. <separator/>
 #: build/trans_presets.java:2385
 msgid "Power Generator"
-msgstr ""
+msgstr "Xerador de enerxía"
 
 #. item "Man Made/Power Generator"
@@ -25989,35 +26058,35 @@
 #: build/trans_presets.java:2389
 msgid "Edit Power Generator"
-msgstr ""
+msgstr "Editar Xerador de Enerxía"
 
 #. item "Man Made/Power Generator" combo "Type"
 #: build/trans_presets.java:2391
 msgid "wind"
-msgstr ""
+msgstr "vento"
 
 #: build/trans_presets.java:2391
 msgid "hydro"
-msgstr ""
+msgstr "hidráulico"
 
 #: build/trans_presets.java:2391
 msgid "fossil"
-msgstr ""
+msgstr "fósil"
 
 #: build/trans_presets.java:2391
 msgid "nuclear"
-msgstr ""
+msgstr "nuclear"
 
 #: build/trans_presets.java:2391
 msgid "coal"
-msgstr ""
+msgstr "carbón"
 
 #: build/trans_presets.java:2391
 msgid "photovoltaic"
-msgstr ""
+msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
 #: build/trans_presets.java:2394
 msgid "Power Station"
-msgstr ""
+msgstr "Central eléctrica"
 
 #. item "Man Made/Power Station"
@@ -26026,10 +26095,10 @@
 #: build/trans_presets.java:2397
 msgid "Edit Power Station"
-msgstr ""
+msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
 #: build/trans_presets.java:2403
 msgid "Power Sub Station"
-msgstr ""
+msgstr "Subestación eléctrica"
 
 #. item "Man Made/Power Sub Station"
@@ -26038,5 +26107,5 @@
 #: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
-msgstr ""
+msgstr "Editar subestación eléctrica"
 
 #. item "Man Made/Power Sub Station" text "Operator"
@@ -26044,10 +26113,10 @@
 #: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
-msgstr ""
+msgstr "Liña de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
 #: build/trans_presets.java:2411
 msgid "Power Tower"
-msgstr ""
+msgstr "Torre de electricidade"
 
 #. item "Man Made/Power Tower"
@@ -26058,23 +26127,23 @@
 #: build/trans_presets.java:2416
 msgid "Edit Power Tower"
-msgstr ""
+msgstr "Editar torre de electricidade"
 
 #. item "Man Made/Power Tower" combo "Type"
 #: build/trans_presets.java:2417
 msgid "tower"
-msgstr ""
+msgstr "torre"
 
 #: build/trans_presets.java:2417
 msgid "pole"
-msgstr ""
+msgstr "poste"
 
 #: build/trans_presets.java:2418
 msgid "Tower reference"
-msgstr ""
+msgstr "Referencia da torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
 #: build/trans_presets.java:2420
 msgid "Power Line"
-msgstr ""
+msgstr "Tendido eléctrico"
 
 #. item "Man Made/Power Line"
@@ -26083,74 +26152,74 @@
 #: build/trans_presets.java:2423
 msgid "Edit Power Line"
-msgstr ""
+msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
 #: build/trans_presets.java:2424
 msgid "Line type"
-msgstr ""
+msgstr "Tipo de liña"
 
 #. item "Man Made/Power Line" combo "Line type"
 #: build/trans_presets.java:2424
 msgid "line"
-msgstr ""
+msgstr "liña"
 
 #: build/trans_presets.java:2424
 msgid "minor_line"
-msgstr ""
+msgstr "baixa tensión"
 
 #. item "Man Made/Power Line" combo "Voltage"
 #: build/trans_presets.java:2429
 msgid "Amount of Cables"
-msgstr ""
+msgstr "Cantidade de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
 #: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
-msgstr ""
+msgstr "Número de arames (mellor:conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
 #: build/trans_presets.java:2430
 msgid "single"
-msgstr ""
+msgstr "sinxelo"
 
 #: build/trans_presets.java:2430
 msgid "double"
-msgstr ""
+msgstr "dobre"
 
 #: build/trans_presets.java:2430
 msgid "triple"
-msgstr ""
+msgstr "triple"
 
 #: build/trans_presets.java:2430
 msgid "quad"
-msgstr ""
+msgstr "cuadruple"
 
 #: build/trans_presets.java:2433
 msgid "Amenities"
-msgstr ""
+msgstr "Servizos"
 
 #. group "Amenities"
 #: build/trans_presets.java:2434
 msgid "Toilets"
-msgstr ""
+msgstr "Baños"
 
 #: build/trans_presets.java:2441
 msgid "limited"
-msgstr ""
+msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
 #: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
 #: build/trans_presets.java:2444
 msgid "Post Box"
-msgstr ""
+msgstr "Buzón de Correos"
 
 #. item "Amenities/Post Box" text "Operator"
 #: build/trans_presets.java:2449
 msgid "Telephone"
-msgstr ""
+msgstr "Teléfono"
 
 #. item "Amenities/Telephone"
@@ -26159,5 +26228,5 @@
 #: build/trans_presets.java:2452
 msgid "Edit Telephone"
-msgstr ""
+msgstr "Editar teléfono"
 
 #. item "Amenities/Telephone" text "Operator"
@@ -26165,5 +26234,5 @@
 #: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
-msgstr ""
+msgstr "Moedas"
 
 #. item "Amenities/Telephone" check "Coins"
@@ -26171,5 +26240,5 @@
 #: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
-msgstr ""
+msgstr "Anotacións"
 
 #. item "Amenities/Telephone" check "Notes"
@@ -26177,5 +26246,5 @@
 #: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
-msgstr ""
+msgstr "Tarxeta de recarga e moedeitos electrónicos"
 
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
@@ -26183,5 +26252,5 @@
 #: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
-msgstr ""
+msgstr "Tarxetas de débito"
 
 #. item "Amenities/Telephone" check "Debit cards"
@@ -26189,15 +26258,15 @@
 #: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
-msgstr ""
+msgstr "Tarxetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
 #: build/trans_presets.java:2460
 msgid "Telephone cards"
-msgstr ""
+msgstr "Tarxetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
 #: build/trans_presets.java:2462
 msgid "Recycling"
-msgstr ""
+msgstr "Reciclaxe"
 
 #. item "Amenities/Recycling"
@@ -26206,5 +26275,5 @@
 #: build/trans_presets.java:2465
 msgid "Edit Recycling station"
-msgstr ""
+msgstr "Editar punto limpo"
 
 #. item "Amenities/Recycling" label "Edit Recycling station"
@@ -26212,35 +26281,35 @@
 #: build/trans_presets.java:2467
 msgid "Batteries"
-msgstr ""
+msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
 #: build/trans_presets.java:2468
 msgid "Cans"
-msgstr ""
+msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
 #: build/trans_presets.java:2469
 msgid "Clothes"
-msgstr ""
+msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
 #: build/trans_presets.java:2470
 msgid "Glass"
-msgstr ""
+msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
 #: build/trans_presets.java:2471
 msgid "Paper"
-msgstr ""
+msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
 #: build/trans_presets.java:2472
 msgid "Scrap Metal"
-msgstr ""
+msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
 #: build/trans_presets.java:2474
 msgid "Waste Basket"
-msgstr ""
+msgstr "Papeleiras"
 
 #. item "Amenities/Waste Basket"
@@ -26248,5 +26317,5 @@
 #: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
-msgstr ""
+msgstr "Editar papeleiras"
 
 #. item "Amenities/Bench"
@@ -26255,31 +26324,31 @@
 #: build/trans_presets.java:2482
 msgid "Backrest"
-msgstr ""
+msgstr "Respaldo"
 
 #: build/trans_presets.java:2483
 msgid "Material"
-msgstr ""
+msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
 #: build/trans_presets.java:2483
 msgid "stone"
-msgstr ""
+msgstr "pedra"
 
 #: build/trans_presets.java:2483
 msgid "plastic"
-msgstr ""
+msgstr "plástico"
 
 #: build/trans_presets.java:2484
 msgid "Colour"
-msgstr ""
+msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
 #: build/trans_presets.java:2484
 msgid "black"
-msgstr ""
+msgstr "negro"
 
 #: build/trans_presets.java:2484
 msgid "brown"
-msgstr ""
+msgstr "marrón"
 
 #. color historic
@@ -26362,35 +26431,35 @@
 #: build/trans_style.java:3342 build/trans_style.java:3350
 msgid "green"
-msgstr ""
+msgstr "verde"
 
 #: build/trans_presets.java:2484
 msgid "red"
-msgstr ""
+msgstr "vermello"
 
 #: build/trans_presets.java:2484
 msgid "blue"
-msgstr ""
+msgstr "azul"
 
 #: build/trans_presets.java:2484
 msgid "gray"
-msgstr ""
+msgstr "gris"
 
 #: build/trans_presets.java:2484
 msgid "white"
-msgstr ""
+msgstr "branco"
 
 #: build/trans_presets.java:2485
 msgid "Amount of Seats"
-msgstr ""
+msgstr "Numero de asentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
 #: build/trans_presets.java:2487
 msgid "Hunting Stand"
-msgstr ""
+msgstr "Apostadeiro de caza"
 
 #. item "Amenities/Hunting Stand"
 #: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
-msgstr ""
+msgstr "Editar apostadeiro de caza"
 
 #. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
@@ -26399,30 +26468,30 @@
 #: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
-msgstr ""
+msgstr "Alto"
 
 #. item "Amenities/Hunting Stand" combo "Height"
 #: build/trans_presets.java:2490
 msgid "low"
-msgstr ""
+msgstr "baixa"
 
 #: build/trans_presets.java:2490
 msgid "half"
-msgstr ""
+msgstr "media"
 
 #: build/trans_presets.java:2490
 msgid "full"
-msgstr ""
+msgstr "total"
 
 #: build/trans_presets.java:2492
 msgid "Hide"
-msgstr ""
+msgstr "Agochar"
 
 #: build/trans_presets.java:2493
 msgid "Lock"
-msgstr ""
+msgstr "Bloquear"
 
 #: build/trans_presets.java:2495
 msgid "Fountain"
-msgstr ""
+msgstr "Fonte"
 
 #. item "Amenities/Fountain"
@@ -26431,10 +26500,10 @@
 #: build/trans_presets.java:2498
 msgid "Edit Fountain"
-msgstr ""
+msgstr "Editar fonte"
 
 #. item "Amenities/Fountain" text "Name"
 #: build/trans_presets.java:2502
 msgid "Drinking Water"
-msgstr ""
+msgstr "Auga potable"
 
 #. item "Amenities/Drinking Water"
@@ -26443,10 +26512,10 @@
 #: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
-msgstr ""
+msgstr "Editar auga potable"
 
 #. item "Amenities/Drinking Water" text "Name"
 #: build/trans_presets.java:2509
 msgid "Fire Hydrant"
-msgstr ""
+msgstr "Hidrante contra incendios"
 
 #. item "Amenities/Fire Hydrant"
@@ -26455,5 +26524,5 @@
 #: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
-msgstr ""
+msgstr "Editar hidrante contra incendios"
 
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
@@ -26461,5 +26530,5 @@
 #: build/trans_presets.java:2515
 msgid "Baby Hatch"
-msgstr ""
+msgstr "Caixa temperada"
 
 #. item "Amenities/Baby Hatch"
@@ -26467,15 +26536,15 @@
 #: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
-msgstr ""
+msgstr "Editar caixa temperada"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
 #: build/trans_presets.java:2523
 msgid "Shops"
-msgstr ""
+msgstr "Tendas"
 
 #. group "Shops"
 #: build/trans_presets.java:2524
 msgid "Car Dealer"
-msgstr ""
+msgstr "Concesionario de automóviles"
 
 #. item "Shops/Car Dealer"
@@ -26483,10 +26552,10 @@
 #: build/trans_presets.java:2526
 msgid "Edit Car Shop"
-msgstr ""
+msgstr "Editar concesionario de automóviles"
 
 #. item "Shops/Car Dealer" text "Operator"
 #: build/trans_presets.java:2531
 msgid "Bike Dealer"
-msgstr ""
+msgstr "Tenda de bicicletas"
 
 #. item "Shops/Bike Dealer"
@@ -26495,28 +26564,28 @@
 #: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
-msgstr ""
+msgstr "Editar tenda de bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
 #: build/trans_presets.java:2538
 msgid "Supermarket"
-msgstr ""
+msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
 #: build/trans_presets.java:2539
 msgid "Edit Supermarket"
-msgstr ""
+msgstr "Editar supermercado"
 
 #: build/trans_presets.java:2544
 msgid "Chemist"
-msgstr ""
+msgstr "Farmacia"
 
 #. item "Shops/Chemist"
 #: build/trans_presets.java:2545
 msgid "Edit Chemist"
-msgstr ""
+msgstr "Editar farmacia"
 
 #: build/trans_presets.java:2550
 msgid "Convenience Store"
-msgstr ""
+msgstr "Tenda de alimentación"
 
 #. item "Shops/Convenience Store"
@@ -26524,9 +26593,9 @@
 #: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
-msgstr ""
+msgstr "Editar tenda de alimentación"
 
 #: build/trans_presets.java:2557
 msgid "Kiosk"
-msgstr ""
+msgstr "Quiosco"
 
 #. item "Shops/Kiosk"
@@ -26534,27 +26603,27 @@
 #: build/trans_presets.java:2559
 msgid "Edit Kiosk"
-msgstr ""
+msgstr "Editar quiosco"
 
 #: build/trans_presets.java:2564
 msgid "Book Store"
-msgstr ""
+msgstr "Librería"
 
 #. item "Shops/Book Store"
 #: build/trans_presets.java:2565
 msgid "Edit Book Store"
-msgstr ""
+msgstr "Editar librería"
 
 #: build/trans_presets.java:2570
 msgid "Travel Agency"
-msgstr ""
+msgstr "Axencia de viaxes"
 
 #. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
-msgstr ""
+msgstr "Editar axencia de viaxes"
 
 #: build/trans_presets.java:2576
 msgid "Butcher"
-msgstr ""
+msgstr "Carnicería"
 
 #. item "Shops/Butcher"
@@ -26562,9 +26631,9 @@
 #: build/trans_presets.java:2578
 msgid "Edit Butcher"
-msgstr ""
+msgstr "Editar carnicería"
 
 #: build/trans_presets.java:2583
 msgid "Baker"
-msgstr ""
+msgstr "Panadeiro"
 
 #. item "Shops/Baker"
@@ -26572,9 +26641,9 @@
 #: build/trans_presets.java:2585
 msgid "Edit Baker"
-msgstr ""
+msgstr "Editar panadeiro"
 
 #: build/trans_presets.java:2590
 msgid "Florist"
-msgstr ""
+msgstr "Floristería"
 
 #. item "Shops/Florist"
@@ -26582,18 +26651,18 @@
 #: build/trans_presets.java:2592
 msgid "Edit Florist"
-msgstr ""
+msgstr "Editar floristería"
 
 #: build/trans_presets.java:2597
 msgid "Organic"
-msgstr ""
+msgstr "Orgánico"
 
 #. item "Shops/Organic"
 #: build/trans_presets.java:2598
 msgid "Edit Organic Shop"
-msgstr ""
+msgstr "Editar tenda de productos orgánicos"
 
 #: build/trans_presets.java:2603
 msgid "Alcohol"
-msgstr ""
+msgstr "Tenda de bebidas alcohólicas"
 
 #. item "Shops/Alcohol"
@@ -26601,54 +26670,54 @@
 #: build/trans_presets.java:2605
 msgid "Edit Alcohol Shop"
-msgstr ""
+msgstr "Editar tenda de bebidas alcohólicas"
 
 #: build/trans_presets.java:2610
 msgid "Beverages"
-msgstr ""
+msgstr "Brebaxes"
 
 #. item "Shops/Beverages"
 #: build/trans_presets.java:2611
 msgid "Edit Beverages Shop"
-msgstr ""
+msgstr "Editar tenda de brebaxes"
 
 #: build/trans_presets.java:2616
 msgid "Computer"
-msgstr ""
+msgstr "Ordenador"
 
 #. item "Shops/Computer"
 #: build/trans_presets.java:2617
 msgid "Edit Computer Shop"
-msgstr ""
+msgstr "Editar tenda de ordenadores"
 
 #: build/trans_presets.java:2622
 msgid "Electronics"
-msgstr ""
+msgstr "Electrónica"
 
 #. item "Shops/Electronics"
 #: build/trans_presets.java:2623
 msgid "Edit Electronics Shop"
-msgstr ""
+msgstr "Editar tenda de electrónica"
 
 #: build/trans_presets.java:2628
 msgid "Hifi"
-msgstr ""
+msgstr "Hifi"
 
 #. item "Shops/Hifi"
 #: build/trans_presets.java:2629
 msgid "Edit Hifi Shop"
-msgstr ""
+msgstr "Editar tenda HIfi"
 
 #: build/trans_presets.java:2634
 msgid "Furniture"
-msgstr ""
+msgstr "Mobles"
 
 #. item "Shops/Furniture"
 #: build/trans_presets.java:2635
 msgid "Edit Furniture Shop"
-msgstr ""
+msgstr "Editar Moblería"
 
 #: build/trans_presets.java:2640
 msgid "Garden Centre"
-msgstr ""
+msgstr "Centro de xardinería"
 
 #. item "Shops/Garden Centre"
@@ -26656,9 +26725,9 @@
 #: build/trans_presets.java:2642
 msgid "Edit Garden Centre"
-msgstr ""
+msgstr "Editar centro de xardinería"
 
 #: build/trans_presets.java:2647
 msgid "Hardware"
-msgstr ""
+msgstr "Ferretería"
 
 #. item "Shops/Hardware"
@@ -26666,9 +26735,9 @@
 #: build/trans_presets.java:2649
 msgid "Edit Hardware Store"
-msgstr ""
+msgstr "Editar ferretería"
 
 #: build/trans_presets.java:2654
 msgid "Do-it-yourself-store"
-msgstr ""
+msgstr "Almacén de bricolaxe"
 
 #. item "Shops/Do-it-yourself-store"
@@ -26676,54 +26745,54 @@
 #: build/trans_presets.java:2656
 msgid "Edit Do-it-yourself-store"
-msgstr ""
+msgstr "Editar almacén de bricolaxe"
 
 #: build/trans_presets.java:2661
 msgid "Stationery"
-msgstr ""
+msgstr "Papelería"
 
 #. item "Shops/Stationery"
 #: build/trans_presets.java:2662
 msgid "Edit Stationery Shop"
-msgstr ""
+msgstr "Editar papelería"
 
 #: build/trans_presets.java:2667
 msgid "Hairdresser"
-msgstr ""
+msgstr "Perruqueria"
 
 #. item "Shops/Hairdresser"
 #: build/trans_presets.java:2668
 msgid "Edit Hairdresser"
-msgstr ""
+msgstr "Editar perruquería"
 
 #: build/trans_presets.java:2673
 msgid "Shoes"
-msgstr ""
+msgstr "Zapatos"
 
 #. item "Shops/Shoes"
 #: build/trans_presets.java:2674
 msgid "Edit Shoe Shop"
-msgstr ""
+msgstr "Editar zapatería"
 
 #: build/trans_presets.java:2679
 msgid "Toys"
-msgstr ""
+msgstr "Xoguetes"
 
 #. item "Shops/Toys"
 #: build/trans_presets.java:2680
 msgid "Edit Toy Shop"
-msgstr ""
+msgstr "Editar Xoguetería"
 
 #: build/trans_presets.java:2685
 msgid "Video"
-msgstr ""
+msgstr "Vídeo"
 
 #. item "Shops/Video"
 #: build/trans_presets.java:2686
 msgid "Edit Video Shop"
-msgstr ""
+msgstr "Editar tenda de vídeos"
 
 #: build/trans_presets.java:2691
 msgid "Dry Cleaning"
-msgstr ""
+msgstr "Tintorería"
 
 #. item "Shops/Dry Cleaning"
@@ -26731,9 +26800,9 @@
 #: build/trans_presets.java:2693
 msgid "Edit Dry Cleaning"
-msgstr ""
+msgstr "Editar tintorería"
 
 #: build/trans_presets.java:2698
 msgid "Laundry"
-msgstr ""
+msgstr "Lavandería"
 
 #. item "Shops/Laundry"
@@ -26741,9 +26810,9 @@
 #: build/trans_presets.java:2700
 msgid "Edit Laundry"
-msgstr ""
+msgstr "Editar Lavandería"
 
 #: build/trans_presets.java:2705
 msgid "Outdoor"
-msgstr ""
+msgstr "Exteriores"
 
 #. item "Shops/Outdoor"
@@ -26751,24 +26820,24 @@
 #: build/trans_presets.java:2707
 msgid "Edit Outdoor Shop"
-msgstr ""
+msgstr "Editar tenda de exteriores"
 
 #. item "Shops/Sports"
 #: build/trans_presets.java:2713
 msgid "Edit Sports Shop"
-msgstr ""
+msgstr "Editar tenda de materiais deportivos"
 
 #: build/trans_presets.java:2718
 msgid "Optician"
-msgstr ""
+msgstr "Óptica"
 
 #. item "Shops/Optician"
 #: build/trans_presets.java:2719
 msgid "Edit Optician"
-msgstr ""
+msgstr "Editar óptica"
 
 #. <separator/>
 #: build/trans_presets.java:2725
 msgid "Vending machine"
-msgstr ""
+msgstr "Máquina expendedora"
 
 #. item "Shops/Vending machine"
@@ -26776,5 +26845,5 @@
 #: build/trans_presets.java:2727
 msgid "Edit Vending machine"
-msgstr ""
+msgstr "Editar máquina expendedora"
 
 #. item "Shops/Vending machine" label "Edit Vending machine"
@@ -26782,66 +26851,66 @@
 #: build/trans_presets.java:2729
 msgid "Vending products"
-msgstr ""
+msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
 #: build/trans_presets.java:2729
 msgid "public_transport_tickets"
-msgstr ""
+msgstr "Billetes de transporte público"
 
 #: build/trans_presets.java:2729
 msgid "public_transport_plans"
-msgstr ""
+msgstr "Bonos de transporte público"
 
 #: build/trans_presets.java:2729
 msgid "parking_tickets"
-msgstr ""
+msgstr "Tickets de aparcamento"
 
 #: build/trans_presets.java:2729
 msgid "food"
-msgstr ""
+msgstr "Alimentación"
 
 #: build/trans_presets.java:2729
 msgid "drinks"
-msgstr ""
+msgstr "Bebidas"
 
 #: build/trans_presets.java:2729
 msgid "sweets"
-msgstr ""
+msgstr "doces"
 
 #: build/trans_presets.java:2729
 msgid "cigarettes"
-msgstr ""
+msgstr "Estanco"
 
 #: build/trans_presets.java:2729
 msgid "photos"
-msgstr ""
+msgstr "Fotos"
 
 #: build/trans_presets.java:2729
 msgid "animal_food"
-msgstr ""
+msgstr "comida para animais"
 
 #: build/trans_presets.java:2729
 msgid "news_papers"
-msgstr ""
+msgstr "Xornáis"
 
 #: build/trans_presets.java:2729
 msgid "toys"
-msgstr ""
+msgstr "xoguetes"
 
 #: build/trans_presets.java:2729
 msgid "stamps"
-msgstr ""
+msgstr "selos"
 
 #: build/trans_presets.java:2729
 msgid "SIM-cards"
-msgstr ""
+msgstr "Tarxetas SIM"
 
 #: build/trans_presets.java:2729
 msgid "telephone_vouchers"
-msgstr ""
+msgstr "Tarxetas telefónicas"
 
 #: build/trans_presets.java:2729
 msgid "vouchers"
-msgstr ""
+msgstr "Bonos"
 
 #: build/trans_presets.java:2729
@@ -26851,28 +26920,28 @@
 #: build/trans_presets.java:2729
 msgid "condoms"
-msgstr ""
+msgstr "gomas do pito"
 
 #: build/trans_presets.java:2729
 msgid "tampons"
-msgstr ""
+msgstr "tampóns"
 
 #: build/trans_presets.java:2729
 msgid "excrement_bags"
-msgstr ""
+msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
 #: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
-msgstr ""
+msgstr "Tarxetas de afidelización ou de desconto"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
 #: build/trans_presets.java:2741
 msgid "Cash"
-msgstr ""
+msgstr "Cartos en efectivo"
 
 #. group "Cash"
 #: build/trans_presets.java:2742
 msgid "Bank"
-msgstr ""
+msgstr "Banco"
 
 #. item "Cash/Bank"
@@ -26880,14 +26949,14 @@
 #: build/trans_presets.java:2744
 msgid "Edit Bank"
-msgstr ""
+msgstr "Editar banco"
 
 #: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
-msgstr ""
+msgstr "Caixeiro automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
 #: build/trans_presets.java:2751
 msgid "Money Exchange"
-msgstr ""
+msgstr "Cambio de moeda"
 
 #. item "Cash/Money Exchange"
@@ -26895,5 +26964,5 @@
 #: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
-msgstr ""
+msgstr "Editar cambio de moeda"
 
 #. item "Cash/Automated Teller Machine"
@@ -26901,15 +26970,15 @@
 #: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
-msgstr ""
+msgstr "Editar Caixeiro"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
 #: build/trans_presets.java:2765
 msgid "Health"
-msgstr ""
+msgstr "Saúde"
 
 #. group "Health"
 #: build/trans_presets.java:2766
 msgid "Doctors"
-msgstr ""
+msgstr "Médicos"
 
 #. item "Health/Doctors"
@@ -26917,18 +26986,18 @@
 #: build/trans_presets.java:2768
 msgid "Edit Doctors"
-msgstr ""
+msgstr "Editar médicos"
 
 #: build/trans_presets.java:2773
 msgid "Dentist"
-msgstr ""
+msgstr "Dentista"
 
 #. item "Health/Dentist"
 #: build/trans_presets.java:2774
 msgid "Edit Dentist"
-msgstr ""
+msgstr "Editar dentista"
 
 #: build/trans_presets.java:2779
 msgid "Pharmacy"
-msgstr ""
+msgstr "Farmacia"
 
 #. item "Health/Pharmacy"
@@ -26936,5 +27005,5 @@
 #: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
-msgstr ""
+msgstr "Editar farmacia"
 
 #. item "Health/Pharmacy" label "Edit Pharmacy"
@@ -26942,9 +27011,9 @@
 #: build/trans_presets.java:2783
 msgid "Dispensing"
-msgstr ""
+msgstr "Expende baixo receta médica"
 
 #: build/trans_presets.java:2787
 msgid "Hospital"
-msgstr ""
+msgstr "Hospital"
 
 #. item "Health/Hospital"
@@ -26952,10 +27021,10 @@
 #: build/trans_presets.java:2789
 msgid "Edit Hospital"
-msgstr ""
+msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
 #: build/trans_presets.java:2793
 msgid "Emergency Access Point"
-msgstr ""
+msgstr "Punto de acceso para emerxencias"
 
 #. item "Health/Emergency Access Point"
@@ -26964,5 +27033,5 @@
 #: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
-msgstr ""
+msgstr "Editar punto de acceso para emerxencias"
 
 #. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
@@ -26971,20 +27040,20 @@
 #: build/trans_presets.java:2799
 msgid "Point Number"
-msgstr ""
+msgstr "Número do punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
 #: build/trans_presets.java:2800
 msgid "Point Name"
-msgstr ""
+msgstr "Nome do Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
 #: build/trans_presets.java:2802
 msgid "Phone Number"
-msgstr ""
+msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
 #: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
-msgstr ""
+msgstr "(Utilizar código internacional, como +12-345-67890)"
 
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
@@ -26992,5 +27061,5 @@
 #: build/trans_presets.java:2806
 msgid "Veterinary"
-msgstr ""
+msgstr "Veterinario"
 
 #. item "Health/Veterinary"
@@ -26999,9 +27068,9 @@
 #: build/trans_presets.java:2809
 msgid "Edit Veterinary"
-msgstr ""
+msgstr "Editar veterinario"
 
 #: build/trans_presets.java:2816
 msgid "Geography"
-msgstr ""
+msgstr "Xeografía"
 
 #. group "Geography"
@@ -27013,50 +27082,50 @@
 #: build/trans_presets.java:2818
 msgid "Continent"
-msgstr ""
+msgstr "Continente"
 
 #. item "Geography/Places/Continent"
 #: build/trans_presets.java:2819
 msgid "Edit Continent"
-msgstr ""
+msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
 #: build/trans_presets.java:2824
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. item "Geography/Places/Country"
 #: build/trans_presets.java:2825
 msgid "Edit Country"
-msgstr ""
+msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
 #: build/trans_presets.java:2830
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. item "Geography/Places/State"
 #: build/trans_presets.java:2831
 msgid "Edit State"
-msgstr ""
+msgstr "Editar estado"
 
 #. item "Geography/Places/State" text "Name"
 #: build/trans_presets.java:2836
 msgid "Region"
-msgstr ""
+msgstr "Rexión"
 
 #. item "Geography/Places/Region"
 #: build/trans_presets.java:2837
 msgid "Edit Region"
-msgstr ""
+msgstr "Editar rexión"
 
 #. item "Geography/Places/Region" text "Name"
 #: build/trans_presets.java:2842
 msgid "County"
-msgstr ""
+msgstr "País"
 
 #. item "Geography/Places/County"
 #: build/trans_presets.java:2843
 msgid "Edit County"
-msgstr ""
+msgstr "Editar país"
 
 #. item "Geography/Places/County" text "Name"
@@ -27064,15 +27133,15 @@
 #: build/trans_presets.java:2849
 msgid "City"
-msgstr ""
+msgstr "Cidade"
 
 #. item "Geography/Places/City"
 #: build/trans_presets.java:2850
 msgid "Edit City"
-msgstr ""
+msgstr "Editar cidade"
 
 #. item "Geography/Places/City" text "Name"
 #: build/trans_presets.java:2855
 msgid "Town"
-msgstr ""
+msgstr "Vila"
 
 #. item "Geography/Places/Town"
@@ -27080,10 +27149,10 @@
 #: build/trans_presets.java:2857
 msgid "Edit Town"
-msgstr ""
+msgstr "Editar Vila"
 
 #. item "Geography/Places/Town" text "Name"
 #: build/trans_presets.java:2862
 msgid "Suburb"
-msgstr ""
+msgstr "Suburbio"
 
 #. item "Geography/Places/Suburb"
@@ -27091,25 +27160,25 @@
 #: build/trans_presets.java:2864
 msgid "Edit Suburb"
-msgstr ""
+msgstr "Editar suburbio"
 
 #. item "Geography/Places/Suburb" text "Name"
 #: build/trans_presets.java:2869
 msgid "Village"
-msgstr ""
+msgstr "Poboación"
 
 #. item "Geography/Places/Village"
 #: build/trans_presets.java:2870
 msgid "Edit Village"
-msgstr ""
+msgstr "Editar poboación"
 
 #. item "Geography/Places/Village" text "Name"
 #: build/trans_presets.java:2875
 msgid "Hamlet"
-msgstr ""
+msgstr "Aldea"
 
 #. item "Geography/Places/Hamlet"
 #: build/trans_presets.java:2876
 msgid "Edit Hamlet"
-msgstr ""
+msgstr "Editar aldea"
 
 #. item "Geography/Places/Hamlet" text "Name"
@@ -27117,5 +27186,5 @@
 #: build/trans_presets.java:2882
 msgid "Locality"
-msgstr ""
+msgstr "Localidade"
 
 #. item "Geography/Places/Locality"
@@ -27123,10 +27192,10 @@
 #: build/trans_presets.java:2884
 msgid "Edit Locality"
-msgstr ""
+msgstr "Editar Localidade"
 
 #. item "Geography/Places/Locality" text "Name"
 #: build/trans_presets.java:2889
 msgid "Island"
-msgstr ""
+msgstr "Illa"
 
 #. item "Geography/Places/Island"
@@ -27134,10 +27203,10 @@
 #: build/trans_presets.java:2891
 msgid "Edit Island"
-msgstr ""
+msgstr "Editar Illa"
 
 #. item "Geography/Places/Island" text "Name"
 #: build/trans_presets.java:2896
 msgid "Islet"
-msgstr ""
+msgstr "Illote"
 
 #. item "Geography/Places/Islet"
@@ -27145,5 +27214,5 @@
 #: build/trans_presets.java:2898
 msgid "Edit Islet"
-msgstr ""
+msgstr "Editar Illote"
 
 #. item "Geography/Places/Islet" text "Name"
@@ -27151,5 +27220,5 @@
 #: build/trans_presets.java:2904
 msgid "Cave Entrance"
-msgstr ""
+msgstr "Entrada de cova"
 
 #. item "Geography/Places/Cave Entrance"
@@ -27157,10 +27226,10 @@
 #: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
-msgstr ""
+msgstr "Editar entrada de cova"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
 #: build/trans_presets.java:2910
 msgid "Peak"
-msgstr ""
+msgstr "Pico"
 
 #. item "Geography/Places/Peak"
@@ -27168,10 +27237,10 @@
 #: build/trans_presets.java:2912
 msgid "Edit Peak"
-msgstr ""
+msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
 #: build/trans_presets.java:2917
 msgid "Glacier"
-msgstr ""
+msgstr "Glaciar"
 
 #. item "Geography/Places/Glacier"
@@ -27179,10 +27248,10 @@
 #: build/trans_presets.java:2919
 msgid "Edit Glacier"
-msgstr ""
+msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
 #: build/trans_presets.java:2924
 msgid "Volcano"
-msgstr ""
+msgstr "Volcán"
 
 #. item "Geography/Places/Volcano"
@@ -27190,70 +27259,70 @@
 #: build/trans_presets.java:2926
 msgid "Edit Volcano"
-msgstr ""
+msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
 #: build/trans_presets.java:2932
 msgid "Boundaries"
-msgstr ""
+msgstr "Fronteiras"
 
 #. group "Boundaries"
 #: build/trans_presets.java:2933
 msgid "National"
-msgstr ""
+msgstr "Nacional"
 
 #. item "Boundaries/National"
 #: build/trans_presets.java:2934
 msgid "Edit National Boundary"
-msgstr ""
+msgstr "Editar fronteira nacional"
 
 #. item "Boundaries/National" text "Name"
 #: build/trans_presets.java:2939
 msgid "Administrative"
-msgstr ""
+msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
 #: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
-msgstr ""
+msgstr "Editar fronteira administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
 #: build/trans_presets.java:2945
 msgid "Civil"
-msgstr ""
+msgstr "Civil"
 
 #. item "Boundaries/Civil"
 #: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
-msgstr ""
+msgstr "Editar fronteira civil"
 
 #. item "Boundaries/Civil" text "Name"
 #: build/trans_presets.java:2951
 msgid "Political"
-msgstr ""
+msgstr "Política"
 
 #. item "Boundaries/Political"
 #: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
-msgstr ""
+msgstr "Editar fronteira política"
 
 #. item "Boundaries/Political" text "Name"
 #: build/trans_presets.java:2957
 msgid "National park"
-msgstr ""
+msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
 #: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
-msgstr ""
+msgstr "Editar límites do parque nacional"
 
 #. item "Boundaries/National park" text "Name"
 #: build/trans_presets.java:2964
 msgid "Land use"
-msgstr ""
+msgstr "Uso do chan"
 
 #. group "Land use"
 #: build/trans_presets.java:2965
 msgid "Tree"
-msgstr ""
+msgstr "Árbore"
 
 #. item "Land use/Tree"
@@ -27262,15 +27331,15 @@
 #: build/trans_presets.java:2968
 msgid "Edit Tree"
-msgstr ""
+msgstr "Editar árbore"
 
 #. item "Land use/Tree" text "Height"
 #: build/trans_presets.java:2973
 msgid "Botanical Name"
-msgstr ""
+msgstr "Nome botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
 #: build/trans_presets.java:2975
 msgid "Wood"
-msgstr ""
+msgstr "Madeira"
 
 #. item "Land use/Wood"
@@ -27279,5 +27348,5 @@
 #: build/trans_presets.java:2978
 msgid "Edit Wood"
-msgstr ""
+msgstr "Editar bosque"
 
 #. item "Land use/Wood" combo "Type"
@@ -27285,17 +27354,17 @@
 #: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
-msgstr ""
+msgstr "conífera"
 
 #: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
-msgstr ""
+msgstr "decíduos"
 
 #: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
-msgstr ""
+msgstr "mixto"
 
 #: build/trans_presets.java:2983
 msgid "Forest"
-msgstr ""
+msgstr "Monte"
 
 #. item "Land use/Forest"
@@ -27304,5 +27373,5 @@
 #: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
-msgstr ""
+msgstr "Editar zona forestal"
 
 #: build/trans_presets.java:2992
@@ -27350,5 +27419,5 @@
 #: build/trans_presets.java:3014
 msgid "Heath"
-msgstr ""
+msgstr "Brezal o landa"
 
 #. item "Land use/Heath"
@@ -27356,5 +27425,5 @@
 #: build/trans_presets.java:3016
 msgid "Edit Heath"
-msgstr ""
+msgstr "Editar brezal o landa"
 
 #. item "Land use/Heath" text "Name"
@@ -27362,5 +27431,5 @@
 #: build/trans_presets.java:3021
 msgid "Farmyard"
-msgstr ""
+msgstr "Edificio agrario"
 
 #. item "Land use/Farmyard"
@@ -27369,5 +27438,5 @@
 #: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
-msgstr ""
+msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
@@ -27435,5 +27504,5 @@
 #: build/trans_presets.java:3065
 msgid "Village Green"
-msgstr ""
+msgstr "Parque Municipal"
 
 #. item "Land use/Village Green"
@@ -27441,5 +27510,5 @@
 #: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
-msgstr ""
+msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
@@ -27489,5 +27558,5 @@
 #: build/trans_presets.java:3097
 msgid "Graveyard"
-msgstr ""
+msgstr "Camposanto (para os cementerios próximos ás igrexas)"
 
 #. item "Land use/Graveyard"
@@ -27495,5 +27564,5 @@
 #: build/trans_presets.java:3099
 msgid "Edit Graveyard"
-msgstr ""
+msgstr "Editar camposanto"
 
 #: build/trans_presets.java:3105
@@ -27509,10 +27578,10 @@
 #: build/trans_presets.java:3114
 msgid "Retail"
-msgstr ""
+msgstr "Comercios"
 
 #. item "Land use/Retail"
 #: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
-msgstr ""
+msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
@@ -27571,30 +27640,30 @@
 #: build/trans_presets.java:3152
 msgid "Brownfield"
-msgstr ""
+msgstr "Zona industrial abandoada"
 
 #. item "Land use/Brownfield"
 #: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
-msgstr ""
+msgstr "Editar terreno abandoado"
 
 #. item "Land use/Brownfield" text "Name"
 #: build/trans_presets.java:3158
 msgid "Greenfield"
-msgstr ""
+msgstr "Zona verde"
 
 #. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
-msgstr ""
+msgstr "Editar zona verde"
 
 #. item "Land use/Greenfield" text "Name"
 #: build/trans_presets.java:3164
 msgid "Landfill"
-msgstr ""
+msgstr "Vertedoiro"
 
 #. item "Land use/Landfill"
 #: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
-msgstr ""
+msgstr "Editar vertedoiro"
 
 #. item "Land use/Landfill" text "Name"
@@ -27621,10 +27690,10 @@
 #: build/trans_presets.java:3190
 msgid "outer segment"
-msgstr ""
+msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
 #: build/trans_presets.java:3191
 msgid "inner segment"
-msgstr ""
+msgstr "segmento interior"
 
 #. item "Relations/Multipolygon" role "inner segment"
@@ -27662,5 +27731,5 @@
 #: build/trans_presets.java:3199
 msgid "no_u_turn"
-msgstr ""
+msgstr "prohibido xiro en U"
 
 #: build/trans_presets.java:3199
@@ -27686,5 +27755,5 @@
 #: build/trans_presets.java:3205
 msgid "via node or way"
-msgstr ""
+msgstr "a través de nodo ou vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
@@ -27815,9 +27884,9 @@
 #: build/trans_presets.java:3214
 msgid "ferry"
-msgstr ""
+msgstr "ferry"
 
 #: build/trans_presets.java:3214
 msgid "ski"
-msgstr ""
+msgstr "ski"
 
 #. color bicycle
@@ -27880,13 +27949,13 @@
 #: build/trans_style.java:740 build/trans_style.java:748
 msgid "foot"
-msgstr ""
+msgstr "pé"
 
 #: build/trans_presets.java:3214
 msgid "tram"
-msgstr ""
+msgstr "tranvía"
 
 #: build/trans_presets.java:3214
 msgid "detour"
-msgstr ""
+msgstr "desvío"
 
 #. color otherrail
@@ -27900,10 +27969,10 @@
 #: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
-msgstr ""
+msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
 #: build/trans_presets.java:3217
 msgid "Symbol description"
-msgstr ""
+msgstr "Descición de símbolo"
 
 #. item "Relations/Route" text "Description"
@@ -27911,31 +27980,31 @@
 #: build/trans_presets.java:3220
 msgid "Network"
-msgstr ""
+msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
 #: build/trans_presets.java:3222
 msgid "Route state"
-msgstr ""
+msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
 #: build/trans_presets.java:3222
 msgid "proposed"
-msgstr ""
+msgstr "Proposto"
 
 #: build/trans_presets.java:3222
 msgid "alternate"
-msgstr ""
+msgstr "alternativo"
 
 #: build/trans_presets.java:3222
 msgid "temporary"
-msgstr ""
+msgstr "temporal"
 
 #: build/trans_presets.java:3222
 msgid "connection"
-msgstr ""
+msgstr "conexión"
 
 #: build/trans_presets.java:3223
 msgid "Color (hex)"
-msgstr ""
+msgstr "Color (hex)"
 
 #. item "Relations/Route" text "Color (hex)"
@@ -27944,30 +28013,30 @@
 #: build/trans_presets.java:3226
 msgid "route segment"
-msgstr ""
+msgstr "segmento da ruta"
 
 #. item "Relations/Route" role "route segment"
 #: build/trans_presets.java:3227
 msgid "forward segment"
-msgstr ""
+msgstr "segmento seguinte"
 
 #. item "Relations/Route" role "forward segment"
 #: build/trans_presets.java:3228
 msgid "backward segment"
-msgstr ""
+msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
 #: build/trans_presets.java:3229
 msgid "halt point"
-msgstr ""
+msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
 #: build/trans_presets.java:3230
 msgid "forward halt point"
-msgstr ""
+msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
 #: build/trans_presets.java:3231
 msgid "backward halt point"
-msgstr ""
+msgstr "anterior punto de parada"
 
 #. <!--
@@ -28044,5 +28113,5 @@
 #: build/trans_style.java:72
 msgid "standard"
-msgstr ""
+msgstr "estándar"
 
 #. mappaint style named "standard"
@@ -28138,5 +28207,5 @@
 #: build/trans_style.java:167
 msgid "bridge"
-msgstr ""
+msgstr "ponte"
 
 #. color bridge
@@ -28194,5 +28263,5 @@
 #: build/trans_style.java:633 build/trans_style.java:4087
 msgid "deprecated"
-msgstr ""
+msgstr "obsoleto"
 
 #. color foot
@@ -28234,5 +28303,5 @@
 #: build/trans_style.java:275 build/trans_style.java:681
 msgid "horse"
-msgstr ""
+msgstr "cabalo"
 
 #. color horse
@@ -28460,5 +28529,5 @@
 #: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
-msgstr ""
+msgstr "barreira"
 
 #. color barrier
@@ -28521,5 +28590,5 @@
 #: build/trans_style.java:548
 msgid "motorroad"
-msgstr ""
+msgstr "Autovía"
 
 #. color street
@@ -28577,5 +28646,5 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-msgstr ""
+msgstr "pista"
 
 #. color rail
@@ -28667,5 +28736,5 @@
 #: build/trans_style.java:842
 msgid "services"
-msgstr ""
+msgstr "servizos"
 
 #. color services
@@ -28679,5 +28748,5 @@
 #: build/trans_style.java:850
 msgid "ford"
-msgstr ""
+msgstr "vado"
 
 #. color ford
@@ -28698,5 +28767,5 @@
 #: build/trans_style.java:865
 msgid "turningcircle"
-msgstr ""
+msgstr "círculo de xiro"
 
 #. color construction
@@ -28711,5 +28780,5 @@
 #: build/trans_style.java:889
 msgid "emergency_access_point"
-msgstr ""
+msgstr "Punto de acceso de emerxencias"
 
 #. color water
@@ -28724,5 +28793,5 @@
 #: build/trans_style.java:1001 build/trans_style.java:1002
 msgid "riverbank"
-msgstr ""
+msgstr "ribeira"
 
 #. color water
@@ -28736,5 +28805,5 @@
 #: build/trans_style.java:1018
 msgid "stream"
-msgstr ""
+msgstr "fluxo"
 
 #. color water
@@ -28748,5 +28817,5 @@
 #: build/trans_style.java:1041
 msgid "dock"
-msgstr ""
+msgstr "muelle"
 
 #. color dock
@@ -28952,5 +29021,5 @@
 #: build/trans_style.java:1731
 msgid "manmade"
-msgstr ""
+msgstr "feito polo home"
 
 #. color manmade
@@ -28964,5 +29033,5 @@
 #: build/trans_style.java:1101
 msgid "rapids"
-msgstr ""
+msgstr "rápidos"
 
 #. color manmade
@@ -29026,5 +29095,5 @@
 #: build/trans_style.java:1174
 msgid "railwaypoint"
-msgstr ""
+msgstr "punto ferroviario"
 
 #. color rail
@@ -29047,10 +29116,10 @@
 #: build/trans_style.java:1191 build/trans_style.java:1200
 msgid "otherrail"
-msgstr ""
+msgstr "outros ferrocarriles"
 
 #. color otherrail
 #: build/trans_style.java:1192
 msgid "railover"
-msgstr ""
+msgstr "paso con mais dun cruce ferroviario"
 
 #. color subway
@@ -29088,5 +29157,5 @@
 #: build/trans_style.java:1238
 msgid "oldrail"
-msgstr ""
+msgstr "vía morta"
 
 #. color rail
@@ -29133,5 +29202,5 @@
 #: build/trans_style.java:1351
 msgid "aeroway"
-msgstr ""
+msgstr "aerovía"
 
 #. color aeroway
@@ -29145,5 +29214,5 @@
 #: build/trans_style.java:1327
 msgid "terminal"
-msgstr ""
+msgstr "terminal"
 
 #. color terminal
@@ -29165,5 +29234,5 @@
 #: build/trans_style.java:1335 build/trans_style.java:1343
 msgid "aeroway_dark"
-msgstr ""
+msgstr "pista (oscuro)"
 
 #. color aeroway
@@ -29177,5 +29246,5 @@
 #: build/trans_style.java:1359
 msgid "aeroway_light"
-msgstr ""
+msgstr "pista (claro)"
 
 #. color aeroway_light
@@ -29247,5 +29316,5 @@
 #: build/trans_style.java:1415 build/trans_style.java:1423
 msgid "aerialway"
-msgstr ""
+msgstr "pista de rodadura"
 
 #. color aerialway
@@ -29262,5 +29331,5 @@
 #: build/trans_style.java:1433 build/trans_style.java:1434
 msgid "piste_easy"
-msgstr ""
+msgstr "pista fácil"
 
 #. color piste_easy
@@ -29275,5 +29344,5 @@
 #: build/trans_style.java:1442 build/trans_style.java:1443
 msgid "piste_intermediate"
-msgstr ""
+msgstr "pista intermedia"
 
 #. color piste_intermediate
@@ -29288,5 +29357,5 @@
 #: build/trans_style.java:1451 build/trans_style.java:1452
 msgid "piste_advanced"
-msgstr ""
+msgstr "pista avanzada"
 
 #. color piste_advanced
@@ -29301,5 +29370,5 @@
 #: build/trans_style.java:1460 build/trans_style.java:1461
 msgid "piste_expert"
-msgstr ""
+msgstr "pista para expertos"
 
 #. color piste_expert
@@ -29314,5 +29383,5 @@
 #: build/trans_style.java:1469 build/trans_style.java:1470
 msgid "piste_freeride"
-msgstr ""
+msgstr "pista de estilo libre"
 
 #. color piste_freeride
@@ -29327,5 +29396,5 @@
 #: build/trans_style.java:1478 build/trans_style.java:1479
 msgid "piste_novice"
-msgstr ""
+msgstr "pista para iniciados"
 
 #. color piste_novice
@@ -29451,5 +29520,5 @@
 #: build/trans_style.java:1593
 msgid "power"
-msgstr ""
+msgstr "enerxía"
 
 #. color manmade
@@ -29463,5 +29532,5 @@
 #: build/trans_style.java:1634 build/trans_style.java:1635
 msgid "pier"
-msgstr ""
+msgstr "porto"
 
 #. color pier
@@ -29475,5 +29544,5 @@
 #: build/trans_style.java:1643
 msgid "pipeline"
-msgstr ""
+msgstr "tubería"
 
 #. color manmade
@@ -29625,5 +29694,5 @@
 #: build/trans_style.java:1877
 msgid "leisure"
-msgstr ""
+msgstr "ocio"
 
 #. color leisure
@@ -29637,5 +29706,5 @@
 #: build/trans_style.java:1789
 msgid "marina"
-msgstr ""
+msgstr "porto deportivo"
 
 #. color leisure
@@ -29736,5 +29805,5 @@
 #: build/trans_style.java:1967
 msgid "amenity"
-msgstr ""
+msgstr "servizos"
 
 #. color amenity
@@ -29841,5 +29910,5 @@
 #: build/trans_style.java:2055 build/trans_style.java:2063
 msgid "amenity_traffic"
-msgstr ""
+msgstr "tráfico de ocio"
 
 #. color amenity_traffic
@@ -30287,5 +30356,5 @@
 #: build/trans_style.java:2543 build/trans_style.java:2558
 msgid "amenity_light"
-msgstr ""
+msgstr "equipamento lumínico"
 
 #. color amenity_light
@@ -30318,5 +30387,5 @@
 #: build/trans_style.java:3403
 msgid "light_water"
-msgstr ""
+msgstr "auga (claro)"
 
 #. color amenity_light
@@ -30380,5 +30449,5 @@
 #: build/trans_style.java:2390
 msgid "health"
-msgstr ""
+msgstr "saúde"
 
 #. color amenity_light
@@ -30752,5 +30821,5 @@
 #: build/trans_style.java:2905
 msgid "shop"
-msgstr ""
+msgstr "tenda"
 
 #. color shop
@@ -30825,5 +30894,5 @@
 #: build/trans_style.java:2963 build/trans_style.java:2971
 msgid "hotel"
-msgstr ""
+msgstr "hotel"
 
 #. color hotel
@@ -30928,5 +30997,5 @@
 #: build/trans_style.java:3044 build/trans_style.java:3066
 msgid "tourism"
-msgstr ""
+msgstr "turismo"
 
 #. color tourism
@@ -31018,5 +31087,5 @@
 #: build/trans_style.java:3140 build/trans_style.java:3148
 msgid "historic"
-msgstr ""
+msgstr "patrimonio histórico"
 
 #. color green
@@ -31029,5 +31098,5 @@
 #: build/trans_style.java:3196
 msgid "quarry"
-msgstr ""
+msgstr "canteira"
 
 #. color quarry
@@ -31041,5 +31110,5 @@
 #: build/trans_style.java:3204
 msgid "landfill"
-msgstr ""
+msgstr "vertedoiro"
 
 #. color landfill
@@ -31061,5 +31130,5 @@
 #: build/trans_style.java:3212 build/trans_style.java:3220
 msgid "basin"
-msgstr ""
+msgstr "cunca"
 
 #. color basin
@@ -31073,5 +31142,5 @@
 #: build/trans_style.java:3228
 msgid "forest"
-msgstr ""
+msgstr "plantación forestal"
 
 #. color residential
@@ -31085,5 +31154,5 @@
 #: build/trans_style.java:3260
 msgid "farmyard"
-msgstr ""
+msgstr "edificio agrario"
 
 #. color farmyard
@@ -31106,5 +31175,5 @@
 #: build/trans_style.java:3269 build/trans_style.java:3277
 msgid "retail"
-msgstr ""
+msgstr "venta ao por menor"
 
 #. color retail
@@ -31118,5 +31187,5 @@
 #: build/trans_style.java:3285
 msgid "industrial"
-msgstr ""
+msgstr "industrial"
 
 #. color industrial
@@ -31130,5 +31199,5 @@
 #: build/trans_style.java:3293
 msgid "brownfield"
-msgstr ""
+msgstr "área postindustrial degradada"
 
 #. color brownfield
@@ -31142,5 +31211,5 @@
 #: build/trans_style.java:3301
 msgid "greenfield"
-msgstr ""
+msgstr "zona verde"
 
 #. color greenfield
@@ -31154,5 +31223,5 @@
 #: build/trans_style.java:3309
 msgid "railland"
-msgstr ""
+msgstr "zona ferroviaria"
 
 #. color construction
@@ -31211,5 +31280,5 @@
 #: build/trans_style.java:3385 build/trans_style.java:3393
 msgid "military"
-msgstr ""
+msgstr "zona militar"
 
 #. color military
@@ -31223,5 +31292,5 @@
 #: build/trans_style.java:3334
 msgid "cemetery"
-msgstr ""
+msgstr "cemiterio"
 
 #. color light_water
@@ -31234,5 +31303,5 @@
 #: build/trans_style.java:3410
 msgid "peak"
-msgstr ""
+msgstr "pico"
 
 #. color peak
@@ -31247,5 +31316,5 @@
 #: build/trans_style.java:3419
 msgid "glacier"
-msgstr ""
+msgstr "glaciar"
 
 #. color glacier
@@ -31259,5 +31328,5 @@
 #: build/trans_style.java:3427
 msgid "volcano"
-msgstr ""
+msgstr "volcán"
 
 #. color volcano
@@ -31315,5 +31384,5 @@
 #: build/trans_style.java:3540
 msgid "natural"
-msgstr ""
+msgstr "espazo natural"
 
 #. color natural
@@ -31327,5 +31396,5 @@
 #: build/trans_style.java:3452
 msgid "scrub"
-msgstr ""
+msgstr "matorral"
 
 #. color natural
@@ -31339,5 +31408,5 @@
 #: build/trans_style.java:3468
 msgid "heath"
-msgstr ""
+msgstr "monte"
 
 #. color heath
@@ -31351,5 +31420,5 @@
 #: build/trans_style.java:3476
 msgid "woodarea"
-msgstr ""
+msgstr "área forestal"
 
 #. color water
@@ -31363,5 +31432,5 @@
 #: build/trans_style.java:3508
 msgid "mud"
-msgstr ""
+msgstr "lodazal"
 
 #. color mud
@@ -31375,5 +31444,5 @@
 #: build/trans_style.java:3516
 msgid "beach"
-msgstr ""
+msgstr "praia"
 
 #. color natural
@@ -31454,5 +31523,5 @@
 #: build/trans_style.java:3604 build/trans_style.java:3612
 msgid "route"
-msgstr ""
+msgstr "ruta"
 
 #. color route
@@ -31548,5 +31617,5 @@
 #: build/trans_style.java:3695
 msgid "boundary"
-msgstr ""
+msgstr "fronteira"
 
 #. color deprecated
@@ -31702,5 +31771,5 @@
 #: build/trans_style.java:4231
 msgid "place"
-msgstr ""
+msgstr "lugar"
 
 #. color place
@@ -31714,5 +31783,5 @@
 #: build/trans_style.java:4239
 msgid "tiger_data"
-msgstr ""
+msgstr "datos_TIGER"
 
 #. <?xml version="1.0"?>
@@ -31723,5 +31792,5 @@
 #: build/trans_surveyor.java:6
 msgid "Tunnel Start"
-msgstr ""
+msgstr "Boca del túnel"
 
 #. <button label="Bridge" hotkey="B" type="toggle">
@@ -31731,5 +31800,5 @@
 #: build/trans_surveyor.java:16
 msgid "Village/City"
-msgstr ""
+msgstr "Poboación/Cidade"
 
 #. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
@@ -31740,5 +31809,5 @@
 #: build/trans_surveyor.java:29
 msgid "One Way"
-msgstr ""
+msgstr "Sentido único"
 
 #. <button label="One Way" hotkey="O" icon="presets/oneway.png">
@@ -31748,5 +31817,5 @@
 #: build/trans_surveyor.java:33
 msgid "Church"
-msgstr ""
+msgstr "Igrexa"
 
 #. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
@@ -31757,5 +31826,5 @@
 #: build/trans_surveyor.java:38
 msgid "Fuel Station"
-msgstr ""
+msgstr "Gasolinera"
 
 #. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
@@ -31766,5 +31835,5 @@
 #: build/trans_surveyor.java:52
 msgid "Shopping"
-msgstr ""
+msgstr "Compras"
 
 #. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
@@ -31774,5 +31843,5 @@
 #: build/trans_surveyor.java:56
 msgid "WC"
-msgstr ""
+msgstr "Baño"
 
 #. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
@@ -31782,5 +31851,5 @@
 #: build/trans_surveyor.java:60
 msgid "Camping"
-msgstr ""
+msgstr "Camping"
 
 #. <button label="Residential" hotkey="5">
@@ -31795,5 +31864,5 @@
 #: build/trans_surveyor.java:93 build/trans_surveyor.java:97
 msgid "Test"
-msgstr ""
+msgstr "Proba"
 
 #. JOSM TagChecker validator file
@@ -31834,15 +31903,15 @@
 #: build/trans_validator.java:38
 msgid "abbreviated street name"
-msgstr ""
+msgstr "nombre abreviado da rúa"
 
 #. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
 #: build/trans_validator.java:40
 msgid "oneway tag on a node"
-msgstr ""
+msgstr "Nodo etiquetado como vía unidireccional"
 
 #. node : W : oneway == *
 #: build/trans_validator.java:41
 msgid "bridge tag on a node"
-msgstr ""
+msgstr "Nodo etiquetado como ponte"
 
 #. node : W : bridge == BOOLEAN_TRUE
@@ -31855,10 +31924,10 @@
 #: build/trans_validator.java:46
 msgid "wrong highway tag on a node"
-msgstr ""
+msgstr "Nodo con etiqueta de vía errónea"
 
 #. node : W : highway == track
 #: build/trans_validator.java:47
 msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "Vía sen clasificar sen nombre"
 
 #. way  : W : highway == unclassified && name != *
@@ -31868,15 +31937,15 @@
 #: build/trans_validator.java:50
 msgid "highway without a reference"
-msgstr ""
+msgstr "via sen referencia"
 
 #. way  : I : highway == motorway && nat_ref != *
 #: build/trans_validator.java:51
 msgid "temporary highway type"
-msgstr ""
+msgstr "Tipo de via temporal"
 
 #. *    : W : highway == road
 #: build/trans_validator.java:52
 msgid "misspelled key name"
-msgstr ""
+msgstr "Nome de clave mal escrito"
 
 #. *    : W : / *name */i == * && name != *
@@ -31886,10 +31955,10 @@
 #: build/trans_validator.java:58
 msgid "cycleway with tag bicycle"
-msgstr ""
+msgstr "vía ciclista con etiqueta bicicleta"
 
 #. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
 #: build/trans_validator.java:59
 msgid "footway with tag foot"
-msgstr ""
+msgstr "vía peatonal con etiqueta a pé"
 
 #. way  : W : highway == footway && foot == BOOLEAN_FALSE
@@ -31898,10 +31967,10 @@
 #: build/trans_validator.java:62
 msgid "separate cycleway as lane on a cycleway"
-msgstr ""
+msgstr "carril bici etiquetado como vía ciclable"
 
 #. way  : W : highway == cycleway && cycleway == lane
 #: build/trans_validator.java:63
 msgid "barrier used on a way"
-msgstr ""
+msgstr "Barreira usada nunha vía"
 
 #. way  : W : highway == * && barrier == *
@@ -31910,25 +31979,25 @@
 #: build/trans_validator.java:66 build/trans_validator.java:67
 msgid "maxspeed used for footway"
-msgstr ""
+msgstr "velocidad máxima usada nunha rúa peatonal"
 
 #. way  : I : highway == steps && maxspeed == *
 #: build/trans_validator.java:69
 msgid "layer tag with + sign"
-msgstr ""
+msgstr "etiqueta capa co signo +"
 
 #. *    : W : layer == /\+.*/
 #: build/trans_validator.java:71
 msgid "street name contains ss"
-msgstr ""
+msgstr "O nome da rua contén ss"
 
 #. *    : I : name == /.*Strasse.*/i
 #: build/trans_validator.java:73
 msgid "relation without type"
-msgstr ""
+msgstr "relación sin tipo"
 
 #. relation : E : type != *
 #: build/trans_validator.java:75
 msgid "restaurant without name"
-msgstr ""
+msgstr "restaurante sen nome"
 
 #. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
@@ -31938,5 +32007,5 @@
 #: build/trans_validator.java:78 build/trans_validator.java:79
 msgid "unusual tag combination"
-msgstr ""
+msgstr "combinación de etiquetas inusual"
 
 #. FORMAT
@@ -31946,10 +32015,10 @@
 #: build/trans_wms.java:5
 msgid "Landsat"
-msgstr ""
+msgstr "Landsat"
 
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
-msgstr ""
+msgstr "Open Aerial Map"
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
@@ -31959,5 +32028,5 @@
 #: build/trans_wms.java:10
 msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo Satélite"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
@@ -31969,10 +32038,10 @@
 #: build/trans_wms.java:12
 msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:13
 msgid "TilesAtHome"
-msgstr ""
+msgstr "TilesAtHome"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
@@ -31982,5 +32051,5 @@
 #: build/trans_wms.java:17
 msgid "Streets NRW Geofabrik.de"
-msgstr ""
+msgstr "Ruas NRW Geofabrik.de de Renania del Norte-Westfalia"
 
 #. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 21299)
+++ applications/editors/josm/i18n/po/he.po	(revision 21304)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-25 00:27+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 09:58+0000\n"
 "Last-Translator: Ilan <ilan@fonz.net>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "עזרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "מתעלם מ-URL לא תקין לקובץ: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "אזהרה"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -229,5 +229,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -279,4 +279,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -332,4 +333,13 @@
 msgstr "הוסף נקודה ע\"י הכנסת קווי אורך ורוחב"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -343,8 +353,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -400,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -454,5 +464,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -463,7 +473,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -481,7 +492,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -549,28 +560,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "לא נבחר פריט להתקרבות."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "התקרב אל {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "קרב את התצוגה לכדי {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "תצוגה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "אין התנגשויות להתמקד בהם"
@@ -659,5 +670,5 @@
 msgstr "שלב {0} דרכים"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "נא בחר לפחות שתי דרכים לשילוב."
@@ -706,5 +717,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -815,5 +826,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr ""
@@ -858,5 +869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -985,25 +996,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1011,33 +1022,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "הזן ערכים לכל ההתנגשויות."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "פתור התנגשויות"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr ""
@@ -1056,5 +1067,5 @@
 msgstr "צרף צומת וקו"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "ללא קיצור"
@@ -1494,8 +1505,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1505,5 +1516,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1902,20 +1913,27 @@
 msgstr "בטל את הפעולה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "בטל את כל הבחירות"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "בטל את כל בחירות העצמים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr ""
@@ -2034,16 +2052,12 @@
 msgstr ""
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "התקרב"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "התרחק"
@@ -2253,9 +2267,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2272,52 +2286,52 @@
 "דרך. Ctrl: מחק פריטים מפנים."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "צייר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "צייר צמתים"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "לא ניתן להוסיף צומת מחוץ לעולם"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "הוסף צומת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "הוסף צומת לדרך"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "חבר דרך קיימת לצומת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "הוסף צומת חדש לדרך קיימת"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "הוסף צומת לדרך וחבר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "יוצר נקודה חדשה."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "בחר את הנקודה שמתחת לסמן."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2326,14 +2340,14 @@
 msgstr[1] "הוסף נקודה חדשה ל-{0} דרכים."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "התחל דרך חדשה מהנקודה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "המשך דרך מהנקודה האחרונה."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "הפסק לצייר."
@@ -2858,5 +2872,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3723,5 +3737,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "נבחר"
@@ -3752,5 +3766,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "רקע"
@@ -3834,9 +3848,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3934,6 +3948,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4051,38 +4065,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "העלה מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "העלה את המאפיינים הנוכחיים לשרת"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "מחרוזת"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "שם המשתמש."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "סיסמת OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "מחרוזת;מחרוזת;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4092,5 +4106,5 @@
 "שם קובץ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4100,5 +4114,5 @@
 "lat=y&lon=x&zoom=z או שם קובץ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4108,87 +4122,87 @@
 "שמחזירה osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "כלשהו"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "במידה וצויין, אפס את התצורה במקום לקרוא אותה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "שם משתמש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "שימוש"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "אפשרויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "הצג עזרה זו"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "הורד את המיקום שבכתובת (עם lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "בחר עם החיפוש הנתון"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "אפס את המאפיינים לברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4198,9 +4212,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "דוגמאות"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4208,37 +4222,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "מאתחל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "טען תוספים מוקדמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "קביעת ברירות מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "יוצר ממשקי גרפי ראשי"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "טעינת תוספים"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4251,5 +4265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4373,10 +4387,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "השכבה אינה ברשימה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4797,5 +4811,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5283,6 +5297,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5293,5 +5307,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5567,5 +5581,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5640,5 +5654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "טען מחדש"
@@ -5694,9 +5708,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
@@ -6822,8 +6836,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7441,55 +7455,55 @@
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "תכונות: {0} \\ חברויות: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "תכונות \\ חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "שנה יחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "מחק מיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "באמת מחק את הבחירה מהיחס {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8116,5 +8130,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8146,21 +8160,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8182,5 +8196,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8194,5 +8208,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8228,14 +8242,14 @@
 msgstr "מספרי משטחים"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8249,5 +8263,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8535,5 +8549,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9269,7 +9283,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9426,4 +9443,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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"
@@ -9592,5 +9610,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9656,18 +9674,18 @@
 msgstr "שכבת נתונים {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "מחוץ לשטח שהורד"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "גירסה {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9676,5 +9694,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9688,5 +9706,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9699,11 +9717,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9712,32 +9730,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} מורכב מ-:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "גירסת API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "המר לשכבת GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9783,8 +9801,4 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10063,5 +10077,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "תמונות בעלות גאותגיות"
@@ -10086,5 +10100,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10116,55 +10130,55 @@
 msgstr "שגיאה בקובץ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "קודמת"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "הסר תמונה משכבה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "הבאה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "מרכז תצוגה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10175,5 +10189,5 @@
 "רום: {0} מ''"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10240,7 +10254,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "הצג\\הסתר טקסט\\סמלים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11048,35 +11061,35 @@
 msgstr "כיול רשם קול"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "צבע"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "סגנון ציור {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "בחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "בחר צבע עבור {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "צבעים בשימוש עצמים אחרים ב JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "צבעים"
@@ -11519,17 +11532,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "מנוטרל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">קיצורי מקלדת</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11537,5 +11550,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11546,5 +11559,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11561,9 +11574,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11574,5 +11587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11581,66 +11594,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "קרא קודם"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "השתמש בברירת המחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "נטרל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "מפתח:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "שים לב: השתמש רק במקשי מקלדת אמיתיים!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "קיצורי מקלדת"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "ערוך קיצורים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "קיצורי תפריט"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr ""
@@ -11701,21 +11714,21 @@
 msgstr "יהיה עליך להפעיל את JOSM מחדש כדי שכמה מההגדרות יכנסו לתוקף."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "הצג קורדינטות כ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "שיטת הטלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "הטלת מפה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11760,10 +11773,9 @@
 msgstr "שינוי קיצור מקלדת ידנית"
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "פעולה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "קיצור-דרך"
@@ -12237,24 +12249,23 @@
 msgstr "סוג לא ידוע: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "שגיאה בניתוח {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12264,17 +12275,17 @@
 msgstr[1] "שנה {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "כלום לא נבחר!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "שנה תכונות"
@@ -12783,11 +12794,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14059,5 +14063,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14070,5 +14074,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14078,5 +14082,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14087,5 +14091,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(טיפ: ניתן לערוך את הקיצורים ב\"מאפיינים\")"
@@ -14455,15 +14459,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14482,18 +14486,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14660,7 +14664,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "בחר שכבת יעד"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15219,7 +15222,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "אפשרויות"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15246,7 +15248,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "מדידות"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16686,31 +16687,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "להחזיר לקדמותו"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "פריטים להוספה:"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "ההיסטוריה של האלמנט"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "מכין נתוני OSM..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-msgid "Revert changeset"
-msgstr ""
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "התבקש: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "מכין..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "שינוי אחרון ב {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -16946,5 +16949,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17021,16 +17023,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -17876,12 +17878,10 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "בטל את כל בחירות העצמים"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "בטל את כל בחירות העצמים"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
@@ -17890,17 +17890,14 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "שם העצם בסמן העכבר."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "בטל את כל בחירות העצמים"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "בטל את כל בחירות העצמים"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
@@ -17913,17 +17910,17 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "קובץ: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "טוען {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "נמצאו {0} התאמות"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18670,4 +18667,14 @@
 msgstr "{0},..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "תצוגה"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19078,4 +19085,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "למטה"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19332,6 +19345,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19340,15 +19361,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19357,5 +19378,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32006,7 +32027,4 @@
 #~ msgstr "ל <nd> אין התייחסות (ref)"
 
-#~ msgid "Preparing..."
-#~ msgstr "מכין..."
-
 #~ msgid "Incorrect password or username."
 #~ msgstr "סיסמא או שם משתמש שגויים."
@@ -32044,7 +32062,4 @@
 #~ msgid "Error parsing server response."
 #~ msgstr "שגיאה בניתוח תשובת השרת."
-
-#~ msgid "Revert"
-#~ msgstr "להחזיר לקדמותו"
 
 #~ msgid "Authors: {0}"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 21299)
+++ applications/editors/josm/i18n/po/is.po	(revision 21304)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
 "PO-Revision-Date: 2010-01-31 17:21+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Hjálp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "Aðvörun"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -225,5 +225,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -263,5 +263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -275,4 +275,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -329,4 +330,13 @@
 msgstr "Bæta við hnút með því að slá inn lengd og breidd"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -340,8 +350,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -397,5 +407,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -451,5 +461,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -460,7 +470,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -478,7 +489,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -546,28 +557,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Ekkert er valið til að þysja að."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Þysja að {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Þysja að {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr ""
@@ -660,5 +671,5 @@
 msgstr "Sameina {0} vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina."
@@ -706,5 +717,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -815,5 +826,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr ""
@@ -858,5 +869,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -985,25 +996,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1011,33 +1022,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Leysa árekstra"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr ""
@@ -1056,5 +1067,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr ""
@@ -1494,8 +1505,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1505,5 +1516,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1909,20 +1920,27 @@
 msgstr "Afturkalla síðustu aðgerð."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Afvelja allt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Afvelja alla hluti."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr ""
@@ -2041,16 +2059,12 @@
 msgstr "Fara í möskvaham"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Þysja inn"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Þysja út"
@@ -2260,9 +2274,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2277,52 +2291,52 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Teikna hnúta og vegi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Get ekki bætt við hnút handan endamarka veraldar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Bæta við hnút"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Bæta hnút við veg"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
+msgid "Connect existing way to node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
-msgid "Connect existing way to node"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Bætti hnút við veg sem til var fyrir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Búa til nýjan hnút."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
 #, java-format
 msgid "Insert new node into way."
@@ -2331,14 +2345,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr ""
@@ -2864,5 +2878,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3730,5 +3744,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr ""
@@ -3759,5 +3773,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "bakgrunnur"
@@ -3841,9 +3855,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3941,6 +3955,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4058,38 +4072,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Hlaða upp stillingum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Hlaða JOSM stillingum þínum upp á OSM þjóninn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "strengur"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Notandanafn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM lykilorð."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4097,5 +4111,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4103,5 +4117,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4109,87 +4123,87 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Notandanafn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4199,9 +4213,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4209,37 +4223,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Upphafsstilli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Bý til aðal notandaviðmót"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Hleð inn viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4252,5 +4266,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4374,10 +4388,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4790,5 +4804,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5276,6 +5290,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5286,5 +5300,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5560,5 +5574,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5633,5 +5647,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Endurhlaða"
@@ -5687,9 +5701,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Færa valið lag upp í röðinni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Færa valið lag niður í röðinni"
@@ -6817,8 +6831,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7436,55 +7450,55 @@
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "{0} eigindi & {1} vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Eigindi & vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Eyða valinu úr venslunum {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Bæta nýjum eigindum við valda hluti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8117,5 +8131,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8147,21 +8161,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Núll bendill, hugsanlega vantar eigindi."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8183,5 +8197,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8195,5 +8209,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8229,14 +8243,14 @@
 msgstr "Reitnúmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8250,5 +8264,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8536,5 +8550,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9272,7 +9286,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9433,4 +9450,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr ""
@@ -9597,5 +9615,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9657,18 +9675,18 @@
 msgstr "Gagnalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "útgáfa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9677,5 +9695,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9689,5 +9707,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9700,11 +9718,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9713,32 +9731,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "Tölfræði um {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API útgáfa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Breyta í GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9784,8 +9802,4 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10060,5 +10074,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr ""
@@ -10083,5 +10097,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10113,55 +10127,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Fyrri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Fjarlægja myndina úr laginu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Næsta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10170,5 +10184,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10233,7 +10247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Sýna/Fela texta og táknmyndir"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11041,35 +11054,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Litur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Velja lit"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Veldu lit fyrir „{0}“"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Litir"
@@ -11516,17 +11529,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11534,5 +11547,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11543,5 +11556,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11558,9 +11571,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11571,5 +11584,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11578,66 +11591,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr ""
@@ -11699,21 +11712,21 @@
 "Athugið að stundum þarf að endurræsa JOSM til að stillingar taki gildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Sýna hnit sem"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Vörpun"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Kortavörpun"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11758,10 +11771,9 @@
 msgstr ""
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Flýtileið"
@@ -12235,24 +12247,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12262,17 +12273,17 @@
 msgstr[1] "Breyta {0} hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Ekkert er valið!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Val óhæfilegt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Vista forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Breyta eigindum"
@@ -12779,11 +12790,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14056,5 +14060,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14067,5 +14071,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14075,5 +14079,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14084,5 +14088,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Ráð: Þú getur breytt flýtileiðum í valkostum)"
@@ -14452,15 +14456,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14479,18 +14483,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14657,7 +14661,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Veldu lag til að sameina"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15181,7 +15184,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Gistiheimili"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15243,7 +15245,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Mælingar"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16677,32 +16678,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Afturkalla"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Breytingaskrá hluts"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Breytingaskrá hluts"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Undirbý gögn..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Opin breytingarsett"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Villa: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Undirbý..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Sýna breytingarsett {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -16938,5 +16940,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17013,16 +17014,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -17868,12 +17869,10 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Afvelja alla hluti."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Veldu hluti til að hlaða upp"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
@@ -17886,12 +17885,10 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Afvelja alla hluti."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Afvelja alla hluti."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
@@ -17900,22 +17897,21 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Loka þessum glugga"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Skrá: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Þysja að {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Hnútur {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18658,4 +18654,14 @@
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Sýn"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19064,4 +19070,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "Bær"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19247,7 +19259,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Loka breytingarsetti"
+msgstr ""
 
 #. Plugin routes
@@ -19319,6 +19330,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19327,15 +19346,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19344,5 +19363,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -31882,7 +31901,4 @@
 #~ "reyna síðar."
 
-#~ msgid "Preparing..."
-#~ msgstr "Undirbý..."
-
 #~ msgid "Uploading..."
 #~ msgstr "Hleð upp gögnum..."
@@ -32012,7 +32028,4 @@
 #~ msgid "Download Area"
 #~ msgstr "Niðurhalssvæði"
-
-#~ msgid "Revert"
-#~ msgstr "Afturkalla"
 
 #~ msgid "Validate either current selection or complete dataset."
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 21299)
+++ applications/editors/josm/i18n/po/it.po	(revision 21304)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-02 12:45+0000\n"
-"Last-Translator: sm bo <Unknown>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-12 10:30+0000\n"
+"Last-Translator: Matteo Fumi <fumi.matteo@gmail.com>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,9 +13,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:52+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -28,12 +28,12 @@
 msgstr "Aiuto"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorato un indirizzo URL di file malformato: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -62,5 +62,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -72,5 +72,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -93,10 +93,10 @@
 msgstr "Attenzione"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Il parametro \"downloadgps\" non accetta nomi di file o indirizzi URL di file"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -116,8 +116,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -231,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -248,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -269,5 +269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -281,4 +281,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -335,4 +336,13 @@
 msgstr "Aggiungi un nodo inserendo latitudine e longitudine"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -346,8 +356,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -407,5 +417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -461,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -470,7 +480,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -488,7 +499,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -556,28 +567,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Nessuna selezione su cui ingrandire la visuale"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Ingrandisci visuale su {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Ingrandisci la visuale su {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Visualizza: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Nessun conflitto su cui ingrandire la visuale"
@@ -671,5 +682,5 @@
 msgstr "Unisci {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Selezionare almeno due percorsi da unire."
@@ -719,5 +730,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -814,5 +825,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Scegli il tipo di oggetto OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -830,5 +841,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Scarica oggetto"
@@ -875,5 +886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -1008,25 +1019,25 @@
 "modifica."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Nodo aggiunto su tutte le intersezioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Elimina i percorsi che non fanno parte di un multi-poligono interno"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Correggi le relazioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "L''area auto-sovrapposta è stata unita"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Le aree sovrapposte sono state unite"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1036,33 +1047,33 @@
 "favore verifica che non siano stati introdotti errori."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Inserire dei valori per tutti i conflitti."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Risolvi conflitti"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Correggi i conflitti di etichette"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Sono stati rimossi elementi dalle Relazioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Unisi Aree: Elimina le way corte"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Strada chiusa (anello)"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Rimuovi i tag dalle way interne"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Funzione di unione delle Aree"
@@ -1081,5 +1092,5 @@
 msgstr "Unisci il nodo e il percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Nessuna scorciatoia"
@@ -1548,8 +1559,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1559,5 +1570,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1980,20 +1991,27 @@
 msgstr "Annulla l''ultima azione."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Deseleziona tutto"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Toglie la selezione da tutti gli oggetti."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Deseleziona tutto (al centro)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Deseleziona tutto (Esc)"
@@ -2122,16 +2140,12 @@
 msgstr "Commuta la visualizzazione a fil di ferro"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Ingrandisci"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Riduci"
@@ -2352,9 +2366,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2372,52 +2386,52 @@
 "gli oggetti che si riferiscono a questo."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Disegna"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Disegna i nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Modalità: Disegna centro"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Non si può disegnare un nodo fuori dal mondo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Aggiungi nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Aggiungi un nodo al percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Collega un percorso esistente al nodo"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Aggiungi un nodo ad un percorso esistente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Aggiungi un nodo al percorso e connetti"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Crea un nuovo nodo."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Seleziona il nodo sotto il cursore."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2426,14 +2440,14 @@
 msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Inizia un nuovo percorso dall''ultimo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Continua un percorso dall''ultimo nodo."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Termina tracciamento."
@@ -3019,5 +3033,5 @@
 msgstr "Aggiungi relazione {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3948,5 +3962,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "selezionato"
@@ -3977,5 +3991,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "sfondo"
@@ -4061,9 +4075,9 @@
 msgstr "Zona PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Polonia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4163,6 +4177,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4282,39 +4296,39 @@
 "''''{1}''''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Carica preferenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Carica sul server le attuali preferenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "stringa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Nome dell''utente."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Password OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 "Ridimensiona l''applet alla geometria data (formato: LARGHEZZAxALTEZZA)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "stringa;stringa;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4324,5 +4338,5 @@
 "lat=y&lon=x&zoom=z oppure un nome di file"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4332,5 +4346,5 @@
 "contenente lat=y&lon=x&zoom=z oppure un nome di file"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4340,57 +4354,57 @@
 "simile a quelel di Google o un URL che restituisce osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "qualsiasi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Se specificato, reimposta la configurazione invece di leggerla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nome utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Password"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opzioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Mostra questo aiuto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Dimensioni e posizione della finestra (secondo lo standard UNIX)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Scarica la zona delimitata dal riquadro di selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Scarica la zona indicata dall''URL (interpretando lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Apre un file (qualunque tipo di file che possa essere aperto con File/Apri)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 "Scarica la zona delimitata dal riquadro di selezione come dati GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
@@ -4398,33 +4412,33 @@
 "gps grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Seleziona i risultati della ricerca della stringa"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Lancia in modalità massimizzata"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Reimposta le preferenze predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Imposta la lingua"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "opzioni fornite come proprietà di sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PERCORSO/DELLA/CARTELLA/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Cambia la cartella per tutte le impostazioni utente"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4438,9 +4452,9 @@
 "allocata (in megabyte)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "Esempi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4450,38 +4464,38 @@
 "questo ordine."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 "Assicurarsi di caricare qualche dato se si utilizza il parametro --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inizializzazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Aggiornando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Installando plugins aggiornati"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Caricamento vecchie estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Impostazioni predefinite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Creazione dell''interfaccia principale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Caricamento estensioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4496,5 +4510,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4621,10 +4635,10 @@
 msgstr "Utente:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "livello non in lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -5081,5 +5095,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5339,5 +5353,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5345,7 +5359,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>Per mantenere la propria versione locale, JOSM<br>deve ripristinare "
-"l''identificativo della primitiva {0} a 0.<br>Al prossimo caricamento il "
-"server le assegnerà<br>un nuovo identificativo.<br>Si è d''accordo?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5608,6 +5619,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5618,5 +5629,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5932,5 +5943,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5983,7 +5994,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
-#, fuzzy, java-format
+#, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Filtro Nascosto: {0} Disabilitato: {0}"
+msgstr "Filtri nascosti:{0} Disabilitati:{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -6005,5 +6016,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Ricarica"
@@ -6059,9 +6070,9 @@
 msgstr "Duplica questo livello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Sposta il livello selezionato in su."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Sposta il layer selezionato in giù."
@@ -7211,8 +7222,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7892,55 +7903,55 @@
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Selezionare la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Selezionare la relazione nella selezione principale"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Seleziona nella lista delle relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Selezionare la relazione nella lista delle relazioni"
@@ -8638,5 +8649,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Confini"
@@ -8668,21 +8679,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Eccezione del puntatore nullo, è probabile che manchino alcuni tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Cerca ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Cliccare per iniziare la ricerca delle località"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Interrogazione del server dei nomi"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Interrogazione del server dei nomi ..."
@@ -8704,5 +8715,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8716,5 +8727,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8750,5 +8761,5 @@
 msgstr "Numeri dei tasselli"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
@@ -8756,9 +8767,9 @@
 "Fallita la lettura del file CSS ''help-browser.css''. L''eccezione è: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "Browser dell''aiuto di JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8780,5 +8791,5 @@
 "\">in inglese</a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -9106,5 +9117,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Rilevati conflitti"
@@ -9950,7 +9961,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Caricamento di {0} oggetti ..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Caricamento di {0} oggetto..."
+msgstr[1] "Caricamento di {0} oggetti..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -10131,4 +10145,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "punto GPS"
@@ -10304,5 +10319,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10371,14 +10386,14 @@
 msgstr "Livello dati {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "al di fuori dell''area scaricata"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "versione {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -10386,5 +10401,5 @@
 "nella versione 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10393,5 +10408,5 @@
 msgstr[1] "Sono stati individuati {0} conflitti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10411,5 +10426,5 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10426,11 +10441,11 @@
 "conflitti e risolverli manualmente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Cliccare per chiudere questa finestra e continuare a modificare"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10439,32 +10454,32 @@
 msgstr[1] "{0} eliminati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} è composto da:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "disattiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Versione delle API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Converti in un layer GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Controllo consistenza dell'insieme dei dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "Nessun problema trovato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Sono stati trovati i seguenti problemi:"
@@ -10512,8 +10527,4 @@
 msgstr[0] "{0} punto"
 msgstr[1] "{0} punti"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "Punto GPS"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
@@ -10807,5 +10818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Immagini georeferenziate"
@@ -10830,5 +10841,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Elimina il file immagine dal disco"
@@ -10862,55 +10873,55 @@
 msgstr "Errore nel file {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Visualizza immagini georeferenziate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Precedente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Visualizza l''immagine precedente"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Immagine georeferenziata: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Rimuovi la fotografia dal layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Elimina il file dal disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Successivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Visualizza l''immagine successiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centra la visualizzazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Ingrandimento ottimale e 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "Sposta la finestra sul pannello laterale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10921,5 +10932,5 @@
 "Altitudine: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10986,7 +10997,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Mostra/Nascondi testo/icone"
+msgstr "Mostra Testo/Icone"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11944,35 +11954,35 @@
 msgstr "Calibrazione del registratore vocale"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Colore"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Stile di disegno {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Scegliere"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Scegliere un colore per {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Reimposta predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Reimposta tutto predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Colori usati da diversi oggetti in JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Colori"
@@ -12446,17 +12456,17 @@
 msgstr "Indirizzo URL di descrizione dell''estensione JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "disattivato"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "Nessun modificatore"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Scorciatoie da tastiera</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12467,5 +12477,5 @@
 "vedere le proprie modifiche.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12481,5 +12491,5 @@
 "per <b>riavviare</b> JOSM dopo aver effettuato delle modifiche qui.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12508,9 +12518,9 @@
 "e Ctrl+: sono in realtà la stessa cosa su una tastiera italiana.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Gruppo Modificatori</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12526,5 +12536,5 @@
 "scorciatoia già presente, allora verrà assegnata una scorciatoia casuale.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12535,66 +12545,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Leggi prima"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Usa l''impostazione predefinita"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Disabilita"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Chiave:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Attenzione: Usare solamente i tasti presenti sulla propria tastiera!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie da tastiera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Modifica le scorciatoie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Modificatore primario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Modificatore secondario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Modificatore terziario:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menu Scorciatoie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Tasti di scelta rapida"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Collegamenti a sotto-finestre"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Gruppi dei modificatori"
@@ -12659,21 +12669,21 @@
 "È necessario riavviare JOSM perché alcune impostazioni abbiano effetto."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Visualizza le coordinate come"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Metodo di proiezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Codice proiezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Proiezione della mappa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12720,10 +12730,9 @@
 msgstr "Cambiare manualmente i collegamenti ai tasti."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Azione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Scorciatoia"
@@ -13263,24 +13272,23 @@
 msgstr "Tipo sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Impossibile leggere {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Sono supportati elementi di tipo {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13290,17 +13298,17 @@
 msgstr[1] "Modifica {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Non è stato selezionato niente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Selezione non adatta!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Applica preimpostazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Modifica Proprietà"
@@ -13859,11 +13867,4 @@
 msgid "Preparing upload request..."
 msgstr "Preparazione della richiesta di caricamento..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Caricamento di {0} oggetto..."
-msgstr[1] "Caricamento di {0} oggetti..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14231,7 +14232,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "Manca l''attributo obbligatorio ''''{0}''''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -14379,7 +14379,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(alla linea {0}, colonna {1})"
+msgstr "Linea {0} colonna {1}: "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -15365,5 +15365,5 @@
 msgstr "inutilizzato"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -15377,5 +15377,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -15385,5 +15385,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15394,5 +15394,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Suggerimento: Si possono modificare le scorciatoie nelle preferenze.)"
@@ -15791,15 +15791,15 @@
 msgstr "Numeri:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr "Impossibile posizionare l'edificio fuori dal mondo."
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Crea edificio"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15818,18 +15818,18 @@
 msgstr "Passo di lunghezza:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr "Disegna edifici"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr "Punta su un angolo dell'edificio per iniziare a disegnare"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr "Punta su un'estremità opposta dell'edificio"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "Imposta la larghezza dell'edificio"
@@ -16013,7 +16013,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Seleziona il livello WMS"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16571,7 +16570,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Guest House"
+msgstr "Utilizzo il mouse"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -16611,7 +16609,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Opzionale"
+msgstr "(facoltativo)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16640,7 +16637,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Decrementa"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -18138,32 +18134,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Ripristina"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Storico dell''oggetto"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Elemento dello storico"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Analisi dei dati dello storico OSM ..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Interroga gruppi di modifiche"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "richiesta: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relazione ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Visualizza il gruppo di modifiche {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18402,5 +18399,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -18477,11 +18473,11 @@
 msgstr "numero di colonna {0} non atteso"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Strumento di verifica delle preimpostazioni delle etichette"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -18490,5 +18486,5 @@
 "vedere l''anteprima dei dialoghi delle preimpostazioni delle etichette."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -19438,57 +19434,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Elimina oggetti"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Elimina oggetti"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Selezionare se i dati devono essere scaricati in un nuovo livello"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Inserire l''ID dell''oggetto che dovrebbe essere scaricato"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Elimina oggetti"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Elimina oggetti"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Inizia la regolazione"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Chiudi la finestra e annulla lo scaricamento"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "File: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Caricamento {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Nodo {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -20278,4 +20266,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Videoteca"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -20728,4 +20726,10 @@
 "dati"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "giù"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -20957,7 +20961,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Apri la finestra per l''interrogazione dei gruppi di modifiche"
+msgstr ""
 
 #. Plugin routes
@@ -21023,11 +21026,11 @@
 #. Plugin turnrestrictions
 #: build/trans_plugins.java:81
-#, fuzzy
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
 msgstr ""
-"L''estensione turnrestrictions permette la creazione e la modifica dei "
-"divieti di svolta nella base dati di OpenStreetMap."
+"L''estensione turnrestrictions permette di inserire e gestire le "
+"informazioni inerenti ai divieti di svolta presenti nella base dati di "
+"OpenStreetMap."
 
 #. Plugin undelete
@@ -21046,6 +21049,14 @@
 "Correttore ortografico integrato per i nomi delle etichette."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -21057,5 +21068,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -21063,10 +21074,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Seleziona una sequenza di percorsi connessi non ramificati"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -21077,5 +21088,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -33540,9 +33551,9 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Seleziona automaticamente il primo livello WMS durante la cattura se "
-#~ "esistono livelli multipli."
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Caricamento di {0} oggetti ..."
+
+#~ msgid "GPS point"
+#~ msgstr "Punto GPS"
 
 #~ msgid "No data imported."
@@ -33816,7 +33827,4 @@
 #~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
 #~ "questo come bug."
-
-#~ msgid "Revert"
-#~ msgstr "Ripristina"
 
 #~ msgid "Set the language."
@@ -35508,4 +35516,10 @@
 #~ msgstr "intervallo"
 
+#~ msgid ""
+#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
+#~ msgstr ""
+#~ "Seleziona automaticamente il primo livello WMS durante la cattura se "
+#~ "esistono livelli multipli."
+
 #~ msgid "<number>"
 #~ msgstr "<numero>"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 21299)
+++ applications/editors/josm/i18n/po/ja.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-10 03:41+0000\n"
-"Last-Translator: higa4 <higa432@gmail.com>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-12 22:09+0000\n"
+"Last-Translator: ribbon <Unknown>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -23,5 +23,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -34,12 +34,12 @@
 msgstr "ヘルプ"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "不正な形式のファイルURL\"{0}\"を無視します。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -78,5 +78,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -99,10 +99,10 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "パラメータ \"downloadgps\" はファイル名もしくはURLとして有効ではありません。"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -122,8 +122,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -235,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -252,5 +252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -273,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -285,4 +285,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -342,4 +343,13 @@
 msgstr "緯度経度を指定して、ノードを追加"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -353,8 +363,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -410,5 +420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -464,5 +474,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -473,7 +483,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -491,7 +502,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -559,28 +570,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "ズームする対象が選択されていません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0}へズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "{0}のビューへズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "表示: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "ズームの対象になる競合はありません"
@@ -670,5 +681,5 @@
 msgstr "{0}ウェイを結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "結合するウェイを少なくとも二つ選択してください。"
@@ -718,5 +729,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -811,5 +822,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "OSMオブジェクトタイプを選択"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -827,5 +838,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "オブジェクトをダウンロード"
@@ -871,5 +882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -998,25 +1009,25 @@
 msgstr "交差点がみつかりません。何も変更されませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "すべての交差点にノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "内側のマルチポリゴンの一部ではないウェイを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "リレーションの修正"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "結合された自己重複エリア"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "結合されたオーバーラップエリア"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1026,33 +1037,33 @@
 "確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "すべての競合に値を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "タグの競合を修正"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "リレーションから要素を削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "エリアの結合：　短いウェイの削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "閉じたウェイ"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "内部のウェイからタグを削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "エリア結合機能"
@@ -1071,5 +1082,5 @@
 msgstr "ノードと線をつなぐ"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "ショートカットなし"
@@ -1523,8 +1534,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1534,5 +1545,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1942,20 +1953,27 @@
 msgstr "最後の操作を取り消します"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "選択なし"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "全てのオブジェクトで選択解除"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "全てを選択解除(Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "全てを選択解除（Escape)"
@@ -2076,16 +2094,12 @@
 msgstr "ワイヤー・フレーム表示切り替え"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "拡大"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "ズームアウト"
@@ -2300,9 +2314,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2319,52 +2333,52 @@
 "ノードは消さない。 Ctrl: 参照するオブジェクトを消す。"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "描画"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "ノードを描画"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "モード: フォーカスを描画"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "世界の外にノードを追加できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "ノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "ノードでウェイに追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "既存のウェイをノードとつなぎます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "既存のウェイに新しいノードを追加"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "新規ノードの作成"
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "カーソルの下のノードを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2372,14 +2386,14 @@
 msgstr[0] "新規ノードを {0}このウェイに追加します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "新規ウェイを最後に操作したノードから開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "最後に操作したノードからウェイを継続"
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "描画の完了"
@@ -2793,5 +2807,5 @@
 msgctxt "search"
 msgid "CS"
-msgstr ""
+msgstr "CS"
 
 #. case insensitive
@@ -2799,5 +2813,5 @@
 msgctxt "search"
 msgid "CI"
-msgstr ""
+msgstr "CI"
 
 #. regex search
@@ -2805,5 +2819,5 @@
 msgctxt "search"
 msgid "RX"
-msgstr ""
+msgstr "RX"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
@@ -2944,5 +2958,5 @@
 msgstr "リレーション {0} を追加"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3618,5 +3632,5 @@
 msgctxt "filter"
 msgid "M"
-msgstr ""
+msgstr "M"
 
 #. translators notes must be in front
@@ -3625,5 +3639,5 @@
 msgctxt "filter"
 msgid "R"
-msgstr ""
+msgstr "R"
 
 #. filter mode: add
@@ -3631,5 +3645,5 @@
 msgctxt "filter"
 msgid "A"
-msgstr ""
+msgstr "A"
 
 #. filter mode: remove
@@ -3637,5 +3651,5 @@
 msgctxt "filter"
 msgid "D"
-msgstr ""
+msgstr "D"
 
 #. filter mode: in selection
@@ -3643,5 +3657,5 @@
 msgctxt "filter"
 msgid "F"
-msgstr ""
+msgstr "F"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
@@ -3842,5 +3856,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "選択済の"
@@ -3871,5 +3885,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "背景"
@@ -3955,9 +3969,9 @@
 msgstr "PUWG ゾーン"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (ポーランド)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3990,5 +4004,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
 msgid "Reunion RGR92"
-msgstr ""
+msgstr "Reunion RGR92"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:410
@@ -4056,6 +4070,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4172,38 +4186,38 @@
 "パラメータ \"{0}\" は空白を想定していますが、現在 \"{1}\" になっています。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "アップロード設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "サーバに現在の設定をアップロードします"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "文字列"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "ユーザの名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSMのパスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "指定された位置でアプレットのサイズ変更（指定フォーマットは、幅x高さ）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "文字列：文字列：…"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4213,5 +4227,5 @@
 "ル名を指定できます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4221,5 +4235,5 @@
 "かファイル名で指定できます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4229,87 +4243,87 @@
 "すURLで指定できます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "任意"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "もし指定されると、読み込む代わりに設定をリセットします。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "ユーザ名"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "パスワード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "使用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "オプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "このヘルプの表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "標準のunix配置引数"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "境界囲みをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "(lat=x&lon=y&zoom=z を含む) URLを位置と解釈してダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "ファイルを開く(ファイル/開くで開かれるファイルの全種類）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "bounding boxを生GPSとしてダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "(lat=x&lon=y&zoom=zがついた)URLで示される場所の生gpsをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "検索から選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "最大モードで起動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "設定を既定に戻します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "言語の設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "Javaシステムのプロパティとして提供されるオプション"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "全てのユーザ設定用フォルダを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4322,9 +4336,9 @@
 "      使用メモリの最大サイズ（メガバイト単位）を指定することができます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4333,37 +4347,37 @@
 "パラメータ --downloadと--downloadgpsと--selectionは、この順序で処理されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "--selectionを使った場合、一部のデータだけをロードすることになります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "初期化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "プラグイン更新中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "更新されたプラグインをインストール中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "早期読み込みプラグインのロード中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "デフォルト設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "メインGUIを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "プラグインのロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4376,5 +4390,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4500,10 +4514,10 @@
 msgstr "ユーザ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "レイヤーがリストにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4937,5 +4951,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5176,5 +5190,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5182,7 +5196,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>あなたのローカルバージョンを残すために、JOSMは<br>プリミティブ {0} の"
-"ID を0にリセットしなければなりません。<br>次回のアップロード時にサーバが新し"
-"いidを割り当てます。<br>よろしいですか？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5431,6 +5442,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5440,5 +5451,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5725,5 +5736,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5798,5 +5809,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "再読込"
@@ -5852,9 +5863,9 @@
 msgstr "このレイヤを複製"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
@@ -6182,5 +6193,5 @@
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "変更セット {2} をダウンロード中。 ({0}/{1})"
+msgstr "変更セット {2} の内容をダウンロード中。 ({0}/{1})"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -6247,5 +6258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:415
 msgid "Zoom to in layer"
-msgstr ""
+msgstr "レイヤにズーム"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
@@ -6987,8 +6998,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7628,55 +7639,55 @@
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "リレーションを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "メインの選択肢から条件を選んでください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "関連リストから選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
@@ -8333,5 +8344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "境界"
@@ -8363,21 +8374,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "検索 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "クリックして場所を検索"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "ネームサーバに問合せ中"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "ネームサーバに問合せ中 ..."
@@ -8399,5 +8410,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8411,5 +8422,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8445,5 +8456,5 @@
 msgstr "タイル数"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
@@ -8452,9 +8463,9 @@
 "CSS ファイル''help-browser.css'' が読み込めません。例外コード: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM ヘルプブラウザ"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8474,5 +8485,5 @@
 "<a href=\"{3}\">英語のヘルプ項目を書くこともできます。</a></p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8784,5 +8795,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "競合が検出されました"
@@ -9556,7 +9567,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "{0} オブジェクトをアップロード中 ..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "{0} オブジェクトをアップロード中..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9724,4 +9737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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ポイント"
@@ -9892,5 +9906,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9958,18 +9972,18 @@
 msgstr "データレイヤー {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "ダウンロード領域の外"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "バージョン {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "警告 : バージョン 0.5 に 0.5 と 0.6 のデータが混ざっている"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9977,5 +9991,5 @@
 msgstr[0] "検出された競合が {0} 個あります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9989,5 +10003,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10001,11 +10015,11 @@
 "決してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "クリックしてこのダイアログを閉じ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10013,32 +10027,32 @@
 msgstr[0] "{0} を削除しました"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0}は以下で構成されています:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "設定解除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "APIバージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "GPXレイヤーの変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "データセット一貫性テスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "問題はありませんでした"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "次の問題が見つかりました:"
@@ -10082,8 +10096,4 @@
 msgstr[0] "{0} ポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "GPS ポイント"
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10370,5 +10380,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "ジオタグのついた画像"
@@ -10391,5 +10401,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "ディスクから画像ファイルを削除"
@@ -10423,55 +10433,55 @@
 msgstr "ファイル{0}にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "ジオタグ付きの画像を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "前へ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "前の画像を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "ジオ画像: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "レイヤーから写真を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "ディスクからファイルを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "次へ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "次の画像を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "中央表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "最適な等倍表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "ダイアログをサイドペインに移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10482,5 +10492,5 @@
 "高度: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10547,7 +10557,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "テキスト/アイコンの表示/非表示"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11412,35 +11421,35 @@
 msgstr "ボイスレコーダの調整"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "塗りつぶしスタイル{0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "{0}の色を選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "既定値に設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "全てを既定値に設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "JOSMの異なるオブジェクトが使う配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "色"
@@ -11887,17 +11896,17 @@
 msgstr "JOSMプラグイン説明URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "無効"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "修飾なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">キーボードショートカット</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11907,5 +11916,5 @@
 "さい。このために変更を確認するにはJOSMを<b>再起動</b>する必要があります。</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11916,5 +11925,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11931,9 +11940,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>修飾グループ</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11944,5 +11953,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11951,66 +11960,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "最初に読む"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "既定の使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "無効にする"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "キー:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "注意：実際のキーボードのキーだけが有効です！"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "ショートカット編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "主要地方道の修飾："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "一般地方道の修飾："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "一般道(2車線以上)の修飾:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "メニューショートカット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "ホットキーショートカット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "サブウインドウのショートカット"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "修飾グループ"
@@ -12071,21 +12080,21 @@
 msgstr "設定を有効にするにはJOSMを再起動する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "座標を次の単位で表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "投影法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "射影コード"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "地図投影法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12130,10 +12139,9 @@
 msgstr "キーボードショートカットを手動で変更"
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "アクション"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "ショートカット"
@@ -12629,24 +12637,23 @@
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "タグ付けプリセットのソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12655,17 +12662,17 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "プロパティを変更する"
@@ -13198,10 +13205,4 @@
 msgid "Preparing upload request..."
 msgstr "アップロード要求を準備中..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "{0} オブジェクトをアップロード中..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13537,7 +13538,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "必要な属性 ''{0}'' がありません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -13677,7 +13677,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(場所: 行 {0}, カラム {1})"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -14589,5 +14589,5 @@
 msgstr "未使用"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14601,5 +14601,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14609,5 +14609,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14618,5 +14618,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(ヒント:設定でショートカットキーを選べます。)"
@@ -14997,15 +14997,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "建物を作成"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15024,18 +15024,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "ビルの幅をセット"
@@ -15215,7 +15215,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "WMSレイヤーを選択"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15761,7 +15760,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "ゲストハウス"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15802,7 +15800,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "オプション"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15831,7 +15828,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "減少"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -17302,32 +17298,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "取り消す"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "オブジェクト履歴"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "履歴アイテム"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "OSM 履歴データ解析中 ..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "クエリ変更セット"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "要求: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "リレーション ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "変更セット {0} を表示"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17563,5 +17560,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17637,11 +17633,11 @@
 msgstr "予想外のカラム番号 {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "タグ付けプリセットテスター"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -17649,5 +17645,5 @@
 "タグ付けプリセットテストを開いてタグ付けプリセットダイアログをプレビュー。"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "先に設定情報のタグ付きプリセットのソースを指定してください。"
@@ -18498,57 +18494,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "オブジェクトを削除"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "オブジェクトを削除"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "新しいレイヤーにデータをダウンロードするなら選択"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "ダウンロードするオブジェクトのIDを入力"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "オブジェクトを削除"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "オブジェクトを削除"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "調整開始"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "ダイアログを閉じてダウンロードをキャンセル"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "ファイル: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "{0} 読み込み中です"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "ノード {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19306,4 +19294,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "ビデオ"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19737,4 +19735,10 @@
 "新しいデータをアップロードするには編集をパブリックにしなければなりません"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "下"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19948,7 +19952,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "ダイアログを開いて変更セットを問い合わせる"
+msgstr ""
 
 #. Plugin routes
@@ -20011,11 +20014,8 @@
 #. Plugin turnrestrictions
 #: build/trans_plugins.java:81
-#, fuzzy
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
 msgstr ""
-"turnrestrictions プラグインを使ってOpenStreetMapデータベースに転回制限を作"
-"成、編集することができます。"
 
 #. Plugin undelete
@@ -20033,6 +20033,14 @@
 "す。タグ名用にスペルチェック機能が統合されています。"
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20043,15 +20051,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20060,5 +20068,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21659,5 +21667,5 @@
 #: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
-msgstr ""
+msgstr "分割された歩行者および自転車道"
 
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
@@ -21999,5 +22007,5 @@
 #: build/trans_presets.java:710
 msgid "Grit Bin"
-msgstr ""
+msgstr "凍結防止用のグリット入れ"
 
 #. item "Waypoints/Grit Bin"
@@ -32524,4 +32532,10 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "{0} オブジェクトをアップロード中 ..."
+
+#~ msgid "GPS point"
+#~ msgstr "GPS ポイント"
+
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -32679,7 +32693,4 @@
 #~ msgid "zoom"
 #~ msgstr "ズーム"
-
-#~ msgid "Revert"
-#~ msgstr "取り消す"
 
 #~ msgid "Layers: {0}"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 21299)
+++ applications/editors/josm/i18n/po/nb.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-02-26 22:59+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-15 16:19+0000\n"
+"Last-Translator: Hans Joachim Desserud <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:30+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Hjelp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Overser feilutformet fil-URL: «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "Advarsel"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -227,5 +227,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -265,5 +265,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -277,4 +277,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -330,4 +331,13 @@
 msgstr "Legg til en node ved å skrive inn lengde- og breddegrad."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -341,8 +351,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -398,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -452,5 +462,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -461,7 +471,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -479,7 +490,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -540,35 +551,35 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "forrige"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "neste"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Inet utvalg å vise."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Gå til {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Skaler og flytt skjermbildet til {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Bilde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Ingen konflikter å vise."
@@ -659,5 +670,5 @@
 msgstr "Sammenføy {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Velg minst to linjer å sammenføye."
@@ -707,5 +718,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -764,5 +775,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
 msgid "Download object..."
-msgstr ""
+msgstr "Last ned objekt..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
@@ -772,5 +783,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
 msgid "Download Object..."
-msgstr ""
+msgstr "Last ned objekt..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:43
@@ -796,5 +807,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86
 msgid "Object type:"
-msgstr ""
+msgstr "Objekttype:"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
@@ -805,5 +816,5 @@
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93
 msgid "Object ID:"
-msgstr ""
+msgstr "Objekt ID:"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:64
@@ -813,14 +824,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77
 msgid "Download Object"
-msgstr ""
+msgstr "Last ned objekt"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
-msgstr ""
+msgstr "Last ned objekt"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:83
 msgid "Start downloading"
-msgstr ""
+msgstr "Start nedlasting"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84
@@ -859,5 +870,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -868,5 +879,5 @@
 #, java-format
 msgid "Copy of {0}"
-msgstr ""
+msgstr "Kopi av {0}"
 
 #. Translators: "Copy {number} of {layer name}"
@@ -874,5 +885,5 @@
 #, java-format
 msgid "Copy {1} of {0}"
-msgstr ""
+msgstr "Kopi {1} av {0}"
 
 #. <button label="Info" hotkey="I">
@@ -976,5 +987,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Vil du virkelig fortsette?"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -986,25 +997,25 @@
 msgstr "Fant ingen skjæring. Ingen endringer ble gjort."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Noder er lagt til i alle skjæringspunkt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Slette indre linjer som ikke er del av multipolygon (relasjoner)"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Reparer relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Slo sammen områder som overlappet seg selv"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Slo sammen overlappende områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1014,33 +1025,33 @@
 "oppstått."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Legg inn verdier for alle konflikter."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Løs konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Reparer konflikter i egenskaper."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Fjernede Element fra Relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Slå sammen arealer: fjern korte linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Lukket linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Fjern egenskaper fra indre linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Funksjon Slå sammen Areal"
@@ -1059,5 +1070,5 @@
 msgstr "Sammenføy node og linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Ingen hurtigtast"
@@ -1254,9 +1265,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
 msgid "Open file"
-msgstr ""
+msgstr "Åpne fil"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:252
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Åpner 1 fil..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:254
@@ -1264,6 +1275,6 @@
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Åpner {0} fil..."
+msgstr[1] "Åpner {0} filer..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:262
@@ -1322,5 +1333,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
 msgid "Move nodes so all angles are 90 or 180 degrees"
-msgstr ""
+msgstr "Flytt noder slik at alle vinkler er 90 eller 180 grader"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
@@ -1398,5 +1409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Slett ufulstendige medlemer?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
@@ -1469,5 +1480,5 @@
 #, java-format
 msgid "Could not rename file ''{0}''"
-msgstr ""
+msgstr "Kunne ikke endre filnavn \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
@@ -1497,8 +1508,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1508,5 +1519,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1676,5 +1687,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
 msgid "Yes, delete nodes"
-msgstr ""
+msgstr "Ja, slett noder"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
@@ -1692,5 +1703,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:119
 msgid "Cancel operation"
-msgstr ""
+msgstr "Avbryt operasjon"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86
@@ -1710,5 +1721,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 msgid "Yes"
-msgstr ""
+msgstr "Ja"
 
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:113
@@ -1911,20 +1922,27 @@
 msgstr "Angre siste handling."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Tøm utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Fjern alle objekter fra utvalg."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Tøm utvalg (Fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Tøm utvalg (Escape)"
@@ -2043,16 +2061,12 @@
 msgstr "Slå av/på akselinjer"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Zoom inn"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zoom ut"
@@ -2267,9 +2281,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2286,52 +2300,52 @@
 "når linjer slettes. Ctrl: slett objekt med referanse."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Tegn"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Tegn noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Modus: Tegne Fokus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Kan ikke legge til node utenfor kartet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Legg til node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Legg til node i linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Knytt eksisterende linje til node"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Legg til en node i eksisterende linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Legg til node i linje og lag tilknytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Lag ny node."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Veg node under pekeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2340,14 +2354,14 @@
 msgstr[1] "Sett inn ny node i {0} linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Start ny linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Fortsett samme linje fra siste node."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Avslutt tegning."
@@ -2881,10 +2895,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La til {0} objekt"
+msgstr[1] "La til {0} objekter"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:57
@@ -2901,5 +2915,5 @@
 #, java-format
 msgid "Change relation {0}"
-msgstr ""
+msgstr "Endre relasjon {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeNodesCommand.java:51
@@ -3753,5 +3767,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "valgt"
@@ -3782,5 +3796,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "bakgrunn"
@@ -3864,9 +3878,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3964,6 +3978,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4081,38 +4095,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Last opp innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Last opp aktive innstillinger til tjener"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "streng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Brukernavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Passord hos OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Endre vinduets størrelse til oppgitt geometri  (format: BREDDExHØYDE)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "string;string;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4122,5 +4136,5 @@
 "lat=y&lon=x&zoom=z, eller filnavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4130,5 +4144,5 @@
 "lat=y&lon=x&zoom=z, eller filnavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4138,87 +4152,87 @@
 "som returnerer osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "enhver"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Hvis angitt, gå til standardinnstillinger i stedet for å lese dem inn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Brukernavn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Passord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "bruk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Vis hjelp"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard Unix-geometri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Last ned områdeavgrensing"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Last ned området i URL (with lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Last ned områdeavgrensing som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Velg med gitt søkestreng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Start maksimert"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Gå tilbake til standardinnstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4228,9 +4242,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "eksempler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4238,37 +4252,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Klargjør"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Laster første programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Setter standardverdier"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Bygger opp hovedskjermbilde"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Laster inn programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4281,5 +4295,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4403,10 +4417,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "Laget er ikke i lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4842,5 +4856,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5338,6 +5352,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5348,5 +5362,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5622,5 +5636,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5695,5 +5709,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Last inn på nytt"
@@ -5749,9 +5763,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Flytt laget en rad opp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Flytt laget en rad ned."
@@ -6877,8 +6891,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7496,55 +7510,55 @@
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8173,5 +8187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8203,21 +8217,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer-feil, muligens manglende egenskaper."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8239,5 +8253,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8251,5 +8265,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8285,14 +8299,14 @@
 msgstr "Flis-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8306,5 +8320,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8603,5 +8617,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Konflikter avdekkeet"
@@ -9341,7 +9355,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9498,4 +9515,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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-punkt"
@@ -9664,5 +9682,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9730,18 +9748,18 @@
 msgstr "Datalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "utenfor nedlastet område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Advarsel: blandede 0.6- og 0.5-data resulterer i versjon 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9750,5 +9768,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9762,5 +9780,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9773,11 +9791,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9786,32 +9804,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "ikke satt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API versjon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9857,8 +9875,4 @@
 msgstr[1] "{0} punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10143,5 +10157,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
@@ -10166,5 +10180,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10196,55 +10210,55 @@
 msgstr "Feil i fil {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Forrige"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Fjern foto fra lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Neste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Midtstill kartbilde"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Zoom beste utsnitt 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10255,5 +10269,5 @@
 "Høyde: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10320,7 +10334,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Vis/skjul tekst/ikoner"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11146,35 +11159,35 @@
 msgstr "Stemme  recorder kalibrering"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Tegnestil {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Velg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Velg en farge for {0}g"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Sett til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Sett alt til standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Farger brukt av forskellige objekt i JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Farger"
@@ -11625,17 +11638,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "deaktivert"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "ingen kombinasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Tastatursnarveier</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11643,5 +11656,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11652,5 +11665,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11667,9 +11680,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Kombinasjonstast grupper</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11680,5 +11693,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11687,66 +11700,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Les først"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Bruk standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Tast:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "OBS: Benytt bare ekte tastaturtaster!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarveier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Rediger snarveier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Første kombinasjonstast:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Andre kombinasjonstast:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Tredje kombinasjonstast:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menysnarveier"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Snarvei til hurtigtaster"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Snarvei til undervindu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Kombinasjonstast grupper:"
@@ -11809,21 +11822,21 @@
 msgstr "Du må starte JOSM for at enkelte innstillingene skal tre i kraft."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Vis koordinater som"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projeksjonsmetode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Kartprojeksjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11868,10 +11881,9 @@
 msgstr "Bytt tastatursnarvei manuelt."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Handling"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Hurtigtast"
@@ -12345,24 +12357,23 @@
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12372,17 +12383,17 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Endre egenskaper"
@@ -12895,11 +12906,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14183,5 +14187,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14194,5 +14198,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14202,5 +14206,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14211,5 +14215,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Hint: Du kan endre hurtigtastene i Innstillinger.)"
@@ -14581,15 +14585,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14608,18 +14612,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14790,7 +14794,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Velg mållag."
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15327,7 +15330,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Gjestehus"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15363,7 +15365,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Tillegg"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15392,7 +15393,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Mål"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16857,32 +16857,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Tilbakestill"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Objekthistorie"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Historikkobjekt"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Klargjør OSM-data …"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Steng åpent endringsset"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "bestilt: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Tilbakestill"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Siste endring på {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17120,5 +17121,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17195,11 +17195,11 @@
 msgstr "Uventet kolonnenummer {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tester Egenskaper i Objektmaler"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -17208,5 +17208,5 @@
 "Objektmaler."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "Du må først oppgi kilde for objektmaler."
@@ -18052,12 +18052,10 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Fjern alle objekter fra utvalg."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Oppdatere object"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
@@ -18066,17 +18064,14 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Navn på objekt ved musepeker"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Oppdatere object"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Oppdatere object"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
@@ -18085,22 +18080,21 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Steng dialog og avbryt nedlasting"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Fil: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Laster {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Node {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18853,4 +18847,14 @@
 msgstr "{0}, …"
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Video"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19265,4 +19269,10 @@
 msgstr "Dine redigeringer må være offentlig frigitt for å laste opp nye data"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "ned"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19468,7 +19478,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Steng åpent endringsset"
+msgstr ""
 
 #. Plugin routes
@@ -19549,6 +19558,14 @@
 "vanlige. Stavekontroll for egenskapsnavn."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19557,15 +19574,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19574,5 +19591,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -25793,5 +25810,5 @@
 #: build/trans_presets.java:2316
 msgid "Height (meters)"
-msgstr ""
+msgstr "Høyde (meter)"
 
 #. item "Man Made/Tower" text "Operator"
@@ -26240,14 +26257,14 @@
 #: build/trans_presets.java:2484
 msgid "Colour"
-msgstr ""
+msgstr "Farge"
 
 #. item "Amenities/Bench" combo "Colour"
 #: build/trans_presets.java:2484
 msgid "black"
-msgstr ""
+msgstr "svart"
 
 #: build/trans_presets.java:2484
 msgid "brown"
-msgstr ""
+msgstr "brun"
 
 #. color historic
@@ -26334,21 +26351,21 @@
 #: build/trans_presets.java:2484
 msgid "red"
-msgstr ""
+msgstr "rød"
 
 #: build/trans_presets.java:2484
 msgid "blue"
-msgstr ""
+msgstr "blå"
 
 #: build/trans_presets.java:2484
 msgid "gray"
-msgstr ""
+msgstr "grå"
 
 #: build/trans_presets.java:2484
 msgid "white"
-msgstr ""
+msgstr "hvit"
 
 #: build/trans_presets.java:2485
 msgid "Amount of Seats"
-msgstr ""
+msgstr "Antall seter"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
@@ -26506,19 +26523,19 @@
 #: build/trans_presets.java:2564
 msgid "Book Store"
-msgstr ""
+msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
 #: build/trans_presets.java:2565
 msgid "Edit Book Store"
-msgstr ""
+msgstr "Rediger bokhandel"
 
 #: build/trans_presets.java:2570
 msgid "Travel Agency"
-msgstr ""
+msgstr "Reisebyrå"
 
 #. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
-msgstr ""
+msgstr "Rediger reisebyrå"
 
 #: build/trans_presets.java:2576
@@ -26971,5 +26988,5 @@
 #: build/trans_presets.java:2816
 msgid "Geography"
-msgstr ""
+msgstr "Geografi"
 
 #. group "Geography"
@@ -32165,7 +32182,4 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Oppfrisk liste - Klikk Reload"
-
-#~ msgid "Revert"
-#~ msgstr "Tilbakestill"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 21299)
+++ applications/editors/josm/i18n/po/nl.po	(revision 21304)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-25 00:06+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 09:29+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:53+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:30+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Help"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ongeldige bestands-URL negeren: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,10 +96,10 @@
 msgstr "Waarschuwing"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Parameter \"downloadgps\" accepteert geen bestandsnamen of bestands-URLs"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -234,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -272,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -284,4 +284,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -340,4 +341,13 @@
 msgstr "Knoop toevoegen door invoeren lengte- en breedtegraad."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -351,8 +361,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -408,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -462,5 +472,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -471,7 +481,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -489,7 +500,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -557,28 +568,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Geen selectie om op in te zoomen."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Inzoomen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Beeld inzoomen op {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Beeld: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Geen conflicten om op in te zoomen"
@@ -671,5 +682,5 @@
 msgstr "{0} wegen combineren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Selecteer twee of meer wegen om te combineren."
@@ -719,5 +730,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -828,5 +839,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr ""
@@ -871,5 +882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -998,25 +1009,25 @@
 msgstr "Geen kruispunt gevonden. Er is niets veranderd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Knooppunten toegevoegd op alle kruispunten"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Wegen die niet deel van een binnenste multipoligoon zijn verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Relaties gerepareerd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Zichzelf overlappend gebied samengevoegd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Zichzelf overlappend gebied samengevoegd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1026,33 +1037,33 @@
 "of er geen fouten zijn geïntroduceerd."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Waarden voor alle conflicten invoeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Conflicten oplossen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Repareer tag conflikten"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "elementen verwijderd van relaties"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Samenvoegen gebieden: Korte wegen verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Gesloten weg"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Tags van binnenste wegen verwijderd"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Gebied samenvoeg functie"
@@ -1071,5 +1082,5 @@
 msgstr "Knoop en lijn koppelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Geen sneltoets"
@@ -1514,8 +1525,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1525,5 +1536,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1944,20 +1955,27 @@
 msgstr "De laatste opdracht opgedaan maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Alles deselecteren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Alle objecten deselecteren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Alles deselecteren (focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Alles (escape) deselecteren"
@@ -2078,16 +2096,12 @@
 msgstr "Draadmodelweergave in- of uitschakelen"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Inzoomen"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Uitzoomen"
@@ -2305,9 +2319,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2324,52 +2338,52 @@
 "behouden bij verwijderen van een weg. CTRL: verwijzende objecten verwijderen."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Tekenen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Knopen tekenen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Modus: tekenmodus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Kan geen knoop buiten de wereld toevoegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Knoop toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Knoop in weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Bestaande weg aan knoop koppelen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Een nieuwe knoop aan een bestaande weg toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Knoop in weg voegen en verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Nieuwe node maken."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Selecteer de node onder de cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2378,14 +2392,14 @@
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Start een nieuwe weg vanaf de node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Weg voortzetten vanaf laatste knoop."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Tekenen beëindigen"
@@ -2940,5 +2954,5 @@
 msgstr "Relatie {0} toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3819,5 +3833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "geselecteerd"
@@ -3848,5 +3862,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "achtergrond"
@@ -3930,9 +3944,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4030,6 +4044,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4147,38 +4161,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Voorkeuren uploaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "De huidige voorkeuren naar de server uploaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "string"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Naam van gebruiker."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM-wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "De applet op de gegeven afmetingen instellen (BREEDTExHOOGTE)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "string;string;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4188,5 +4202,5 @@
 "lat=y&lon=x&zoom=z  of een bestandsnaam"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4196,5 +4210,5 @@
 "lat=y&lon=x&zoom=z of een bestandsnaam"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4204,9 +4218,9 @@
 "achtige zoekstring of een URL die een OSM-XML terugkrijgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "iedere"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
@@ -4214,79 +4228,79 @@
 "plaats van gelezen."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "gebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Deze hulptekst tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standaard UNIX-geometrieargument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Het omgrensde gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "De locatie in de URL (met lat=x&lon=y&zoom=z) downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Het omgrensde gebied downloaden als rawe GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Met de opgegeven zoekactie selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Gemaximaliseerd openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "De voorkeuren herstellen op standaardwaarden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4296,9 +4310,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "voorbeelden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4306,37 +4320,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initialiseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Vroege plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Standaarden instellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Hoofdscherm aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Plugins laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4351,5 +4365,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4473,10 +4487,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "laag niet in lijst."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4892,5 +4906,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5378,6 +5392,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5388,5 +5402,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5666,5 +5680,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5739,5 +5753,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Herladen"
@@ -5793,9 +5807,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "De geselecteerde laag een rij omhoog verplaatsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "De geselecteerde laag een rij omlaag verplaatsen."
@@ -6923,8 +6937,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7542,55 +7556,55 @@
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8220,5 +8234,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8250,21 +8264,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Nulwijzeruitzondering, mogelijk ontbreken er wat tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8286,5 +8300,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8298,5 +8312,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8332,14 +8346,14 @@
 msgstr "Tegelnummers"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8353,5 +8367,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8647,5 +8661,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Conflicten gedetecteerd"
@@ -9396,7 +9410,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Versturen van {0} objecten ..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9554,4 +9571,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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-punt"
@@ -9720,5 +9738,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9786,18 +9804,18 @@
 msgstr "Gegevenslaag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "buiten gedownload gebied"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9806,5 +9824,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9818,5 +9836,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9829,11 +9847,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9842,32 +9860,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} bestaat uit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API-versie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Naar GPX-laag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9913,8 +9931,4 @@
 msgstr[1] "{0} punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10199,5 +10213,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
@@ -10222,5 +10236,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10252,55 +10266,55 @@
 msgstr "Bestand {0} gaat fout"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Vorige"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Foto uit laag verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Volgende"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Beeld centreren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Zoom optimaal en 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10311,5 +10325,5 @@
 "Hoogte: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10378,7 +10392,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Tekst/pictogrammen tonen/verbergen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11207,35 +11220,35 @@
 msgstr "Calibratie geluidsopname"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Tekenstijl {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Kies"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Selecteer een kleur voor {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Naar standaardwaarde zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Alles naar standaardwaarde zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Kleuren gebruikt door verschillende objecten in JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Kleuren"
@@ -11691,17 +11704,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "uitgeschakeld"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "geen aanpastoets"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Sneltoetsen</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11709,5 +11722,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11718,5 +11731,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11733,9 +11746,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Groepen aanpastoetsen</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11746,5 +11759,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11755,66 +11768,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Lees dit eerst"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Gebruik de standaard"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Toets:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Let op: gebruik alleen bestaande toetsen op het toetsenbord!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Sneltoetsen bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Eerste keuze:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Tweede keuze:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Derde keuze:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Snelmenu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Sneltoetsen hotkey"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Sneltoetsen nevenscherm"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Groepen aanpastoetsen"
@@ -11876,21 +11889,21 @@
 msgstr "U dient JOSM opnieuw te starten om sommige instellingen te activeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Coördinaten tonen als"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projectiemethode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Kaartprojectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11935,10 +11948,9 @@
 msgstr "Sneltoetsen handmatig wijzigen."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Opdracht"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Sneltoets"
@@ -12413,24 +12425,23 @@
 msgstr "Onbekend type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementen van type {0} worden ondersteund."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12440,17 +12451,17 @@
 msgstr[1] "{0} objecten wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Voorinstelling toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Eigenschappen veranderen"
@@ -12961,11 +12972,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14244,5 +14248,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14255,5 +14259,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14263,5 +14267,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14272,5 +14276,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tip: je kunt sneltoetsen in Voorkeuren bewerken.)"
@@ -14640,15 +14644,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14667,18 +14671,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14845,7 +14849,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Selecteer de doellaag"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15382,7 +15385,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Pension"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15418,7 +15420,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "opties"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15447,7 +15448,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Metingen"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16911,32 +16911,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Terugdraaien"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Object geschiedenis"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Elementgeschiedenis"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "OSM-gegevens voorbereiden..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Sluit open changesets"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "verzocht: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relatie ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Laatste verandering op {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17172,5 +17173,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17247,16 +17247,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tester tagvoorkeuze"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr "Open tagvoorkeuzetester om de voorkeuzedialogen te bekijken."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "U dient eerst bronnen van tagvoorkeuzen in Voorkeuren op te geven."
@@ -18102,32 +18102,26 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Alle objecten deselecteren."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Verwijder {0} object"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Selecteer als de data naar een nieuwe laag moet worden gedownload"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Geef een URL waarvandaan de data gedownload moet worden"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Ververs objecten"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Ververs objecten"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
@@ -18136,22 +18130,21 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Sluit dialoog en stop het downloaden"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Bestand: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "{0} laden"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "{0} overeenkomsten gevonden"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18916,4 +18909,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Videotheek"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19331,4 +19334,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "omlaag"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19514,7 +19523,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Sluit open changesets"
+msgstr ""
 
 #. Plugin routes
@@ -19586,6 +19594,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19594,15 +19610,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19611,5 +19627,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32071,4 +32087,7 @@
 msgstr "Sicilië - Italië"
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Versturen van {0} objecten ..."
+
 #~ msgid "Select a bookmark first."
 #~ msgstr "Selecteer eerst een bladwijzer."
@@ -32236,7 +32255,4 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Klik Herladen om lijst te verversen"
-
-#~ msgid "Revert"
-#~ msgstr "Terugdraaien"
 
 #~ msgid "Cannot connect to server."
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 21299)
+++ applications/editors/josm/i18n/po/pl.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-09 21:45+0000\n"
-"Last-Translator: Rafał <Unknown>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-16 10:22+0000\n"
+"Last-Translator: Yarl <carebone@gmail.com>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -24,5 +24,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -35,12 +35,12 @@
 msgstr "Pomoc"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Pominięto niepoprawny URL do pliku: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -79,5 +79,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -100,9 +100,9 @@
 msgstr "Uwaga"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametr \"downloadgsp\" nie przyjmuje nazw plików lub adresów URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -122,8 +122,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -234,5 +234,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -251,5 +251,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -272,5 +272,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -284,4 +284,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -339,4 +340,13 @@
 msgstr "Dodaje węzeł po podaniu wysokości i szerokości geograficznej."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -350,8 +360,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -407,5 +417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -461,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -470,7 +480,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -488,7 +499,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -556,28 +567,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Brak zaznaczenia, które można pokazać"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Pokaż {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Powiększ aby pokazać: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Widok: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Brak konfliktów, które można pokazać"
@@ -670,5 +681,5 @@
 msgstr "Połącz {0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Wybierz co najmniej dwie drogi do połączenia."
@@ -718,5 +729,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -781,5 +792,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
 msgid "Download OSM object by ID."
-msgstr "Pobierz obiekt wg ID."
+msgstr "Pobiera obiekt wg ID"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
@@ -800,5 +811,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46
 msgid "Download referrers"
-msgstr ""
+msgstr "Pobierz powiązane"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
@@ -813,5 +824,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Wynierz typ obiektu OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -829,5 +840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Pobierz obiekt"
@@ -872,5 +883,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -964,4 +975,5 @@
 msgid "Please select at least one closed way that should be joined."
 msgstr ""
+"Proszę wybrać co najmniej jedną zamkniętą drogę, która powinna być połączona"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
@@ -1000,59 +1012,61 @@
 msgstr "Brak części wspólnej. Nic nie zmieniono."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Dodano węzły na wszystkich przecięciach"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Popraw relacje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Połączono nakładające się obszary"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Połączono nakładające się na siebie obszary"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
 "verify no errors have been introduced."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+"Niektóre z dróg są częściami relacji które zostały zmodyfikowane. Proszę "
+"sprawdzić czy wprowadzone zmiany nie spowodowały błędów."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Podaj wartości dla wszystkich konfliktów."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Rozwiąż konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Popraw konflikty tagów"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Usuń Element z Relacji"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Droga zamknięta"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+msgstr "Usunięto tagi z dróg wewnętrznych"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr ""
@@ -1071,5 +1085,5 @@
 msgstr "Połącz węzeł i linię"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Brak skrótu"
@@ -1102,5 +1116,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 msgid "Jump there"
-msgstr ""
+msgstr "Skocz tutaj"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104
@@ -1150,4 +1164,6 @@
 "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
 msgstr ""
+"Nie mogę połączyć węzłów. Potrzebowałbym usunąć drogę {0}, która jest "
+"aktualnie używana."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:269
@@ -1372,5 +1388,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
 msgid "Selection must consist only of ways and nodes."
-msgstr ""
+msgstr "Wybór musi zawierać wyłącznie drogi i węzły."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:188
@@ -1385,5 +1401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:206
 msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
+msgstr "Wybrane elementy nie moga być poddane ortogonalizacji"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:264
@@ -1513,8 +1529,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1524,5 +1540,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1934,20 +1950,27 @@
 msgstr "Cofa ostatnią czynność."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Odznacz wszystko"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Odznacza wszystkie obiekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Odznacz wszystko (zaznaczenie)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Odznacz wszystko (anulowanie)"
@@ -2068,16 +2091,12 @@
 msgstr "Przełącza widok szkieletowy"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Powiększ"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zmniejsz"
@@ -2256,6 +2275,7 @@
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Konflikt podczas pobierania"
+msgstr[1] "Konflikty podczas pobierania"
+msgstr[2] "Konflikty podczas pobierania"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:222
@@ -2287,9 +2307,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2306,52 +2326,52 @@
 "usuwaniu drogi. Ctrl: usuwa powiązane obiekty."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Rysowanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Tworzenie węzłów i dróg."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Nie można dodać węzła poza granicami świata."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Dodaj węzeł"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Dodaj węzeł do drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Połącz istniejący drogę z węzłem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Dodaj nowy węzeł do istniejącej drogi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Dodaj węzeł do drogi i połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Utwórz nowy węzeł."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Zaznacz węzeł pod kursorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2361,14 +2381,14 @@
 msgstr[2] "Wstaw w drogę nowe węzły {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Zacznij nową drogę od ostatniego węzła"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Kontynuuj drogę od ostatniego węzła."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Zakończ rysowanie."
@@ -2400,4 +2420,6 @@
 "its normal."
 msgstr ""
+"Przeciągnij segment drogi aby utworzyć prostokąt. Ctrl - przeciąganie "
+"segmentów wzdłuż normalnej."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
@@ -2443,5 +2465,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
-msgstr ""
+msgstr "Cofnij przesunięcie"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
@@ -2726,5 +2748,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
 msgid "Submit filter"
-msgstr ""
+msgstr "Stwórz filtr"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
@@ -2888,22 +2910,23 @@
 #, java-format
 msgid "Add node {0}"
-msgstr "Dodaj węzeł {0}"
+msgstr "Dodano węzeł {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
 #, java-format
 msgid "Add way {0}"
-msgstr "Dodaj drogę {0}"
+msgstr "Dodano drogę {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
 #, java-format
 msgid "Add relation {0}"
-msgstr "Dodaj relację {0}"
-
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+msgstr "Dodano relację {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Dodano {0} obiekt"
+msgstr[1] "Dodano {0} obiekty"
+msgstr[2] "Dodano {0} obiektów"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:57
@@ -3023,15 +3046,15 @@
 #, java-format
 msgid "Delete node {0}"
-msgstr ""
+msgstr "Usunięto węzeł {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:160
 #, java-format
 msgid "Delete way {0}"
-msgstr ""
+msgstr "Usunięto drogę {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
 #, java-format
 msgid "Delete relation {0}"
-msgstr ""
+msgstr "Usunięto relację {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
@@ -3039,6 +3062,7 @@
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Usunięto {0} objekt"
+msgstr[1] "Usunięto {0} objekty"
+msgstr[2] "Usunięto {0} objektów"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
@@ -3046,6 +3070,7 @@
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Usunięto {0} węzeł"
+msgstr[1] "Usunięto {0} węzły"
+msgstr[2] "Usunięto {0} węzłów"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:181
@@ -3053,6 +3078,7 @@
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Usunięto {0} drogę"
+msgstr[1] "Usunięto {0} drogi"
+msgstr[2] "Usunięto {0} dróg"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182
@@ -3060,6 +3086,7 @@
 msgid "Delete {0} relation"
 msgid_plural "Delete {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Usunięto {0} relację"
+msgstr[1] "Usunięto {0} relacje"
+msgstr[2] "Usunięto {0} relacji"
 
 #. leave message in one tr() as there is a grammatical
@@ -3142,6 +3169,7 @@
 msgid "Rotate {0} node"
 msgid_plural "Rotate {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Obrócono {0} węzeł"
+msgstr[1] "Obrócono {0} węzły"
+msgstr[2] "Obrócono {0} węzłów"
 
 #: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
@@ -3788,5 +3816,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "zaznaczony"
@@ -3817,5 +3845,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "tło"
@@ -3899,9 +3927,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3957,5 +3985,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
+msgstr "Nie pokazuj ponownie (zapamiętaj wybór)"
 
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:84
@@ -3999,6 +4027,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4118,38 +4146,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Wyślij Ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Wyślij bieżące ustawienia na serwer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "tekst"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Nazwa użytkownika."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Hasło OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "tekst;tekst;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4157,5 +4185,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4163,5 +4191,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4169,87 +4197,87 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "dowolne"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Hasło"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "użycie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opcje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Wyświetl tę pomoc"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Przywróć domyślne ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4259,9 +4287,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "przykłady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4269,37 +4297,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicjalizacja"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Ładowanie wczesnych wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Zapisywanie domyślnych ustawień"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Przygotowywanie interfejsu użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Ładowanie wtyczek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4312,5 +4340,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4434,10 +4462,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "warstwa nie jest na liście."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4755,14 +4783,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:245
 msgid "Compare "
-msgstr ""
+msgstr "Porównaj "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
 msgid "My version"
-msgstr ""
+msgstr "Moja wersja"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:281
 msgid "List of elements in my dataset, i.e. the local dataset"
-msgstr ""
+msgstr "Lista elementów w moim zestawie zmian czyli lokalnym"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
@@ -4770,5 +4798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
 msgid "Merged version"
-msgstr ""
+msgstr "Połączona wersja"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287
@@ -4777,13 +4805,15 @@
 "decisions are applied."
 msgstr ""
+"Lista połączonych elementów. Zastąpią one moje elementy kiedy zostanie "
+"zastosowana decyzja o połączeniu."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
 msgid "Their version"
-msgstr ""
+msgstr "Ich wersja"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
+msgstr "Lista elementów w ich zestawie zmian czyli na serwerze"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425
@@ -4847,5 +4877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
 msgid "Up"
-msgstr ""
+msgstr "W górę"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
@@ -4856,5 +4886,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
 msgid "Down"
-msgstr ""
+msgstr "W dół"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:730
@@ -4864,5 +4894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -4912,6 +4942,7 @@
 msgid "My version ({0} entry)"
 msgid_plural "My version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Moja wersja ({0} pozycja)"
+msgstr[1] "Moja wersja ({0} pozycje)"
+msgstr[2] "Moja wersja ({0} pozycji)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:876
@@ -4919,6 +4950,7 @@
 msgid "Merged version ({0} entry)"
 msgid_plural "Merged version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Połączona wersja ({0} pozycja)"
+msgstr[1] "Połączona wersja ({0} pozycje)"
+msgstr[2] "Połączona wersja ({0} pozycji)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:879
@@ -4926,6 +4958,7 @@
 msgid "Their version ({0} entry)"
 msgid_plural "Their version ({0} entries)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ich wersja ({0} pozycja)"
+msgstr[1] "Ich wersja ({0} pozycje)"
+msgstr[2] "Ich wersja  ({0} pozycji)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:942
@@ -5018,13 +5051,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
 msgid "Coordinates:"
-msgstr ""
+msgstr "Współrzędne:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
 msgid "Deleted State:"
-msgstr ""
+msgstr "Usunięte:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
 msgid "Visible State:"
-msgstr ""
+msgstr "Widoczne:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
@@ -5039,5 +5072,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
 msgid "(none)"
-msgstr ""
+msgstr "(brak)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
@@ -5048,13 +5081,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
 msgid "not deleted"
-msgstr ""
+msgstr "nie zostały usunięte"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
 msgid "visible (on the server)"
-msgstr ""
+msgstr "widoczne (na serwerze)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
 msgid "not visible (on the server)"
-msgstr ""
+msgstr "nie widoczne (na serwerze)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
@@ -5350,6 +5383,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5361,5 +5394,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5572,5 +5605,5 @@
 #, java-format
 msgid "Conflicts: {0} unresolved"
-msgstr ""
+msgstr "Konflikty: {0} nierozwiązanych"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
@@ -5637,5 +5670,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5688,7 +5721,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
-#, fuzzy, java-format
+#, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Filtr Ukryte: {0} Zablokowane: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -5710,5 +5743,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Odśwież"
@@ -5764,9 +5797,9 @@
 msgstr "Skopiuj warstwę"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
@@ -6893,8 +6926,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7514,55 +7547,55 @@
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Właściwości: {0} / członkostwo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Właściwości / członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Zmień relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8193,5 +8226,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8223,21 +8256,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Szukaj ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Kliknij aby rozpocząć szukanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Odpytywanie serwera nazw"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Odpytywanie serwera nazw…"
@@ -8259,5 +8292,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8271,5 +8304,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8305,14 +8338,14 @@
 msgstr "Numery kafelków mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "Przeglądarka pomocy JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8326,5 +8359,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8615,5 +8648,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Wykryto konflikty"
@@ -9002,5 +9035,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Usuwa warstwy bez zapisywania. Niezapisane zmiany zostaną utracone."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -9350,7 +9383,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9510,4 +9546,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "punkt GPS"
@@ -9679,5 +9716,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9743,25 +9780,26 @@
 msgstr "Warstwa danych {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "poza pobranym obszarem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "wersja {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
 msgid_plural "There were {0} conflicts detected."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+msgstr[0] "Wykryto {0} konflikt."
+msgstr[1] "Wykryto {0} konflikty."
+msgstr[2] "Wykryto {0} konfliktów."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9775,5 +9813,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9784,13 +9822,20 @@
 "Dialog and manually resolve them."
 msgstr[0] ""
+"{0} konflikt pozostaje do rozwiązania.<br><br>Proszę otworzyć okno "
+"Konfliktów aby rozwiązać go ręcznie."
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+"{0} konflikty pozostaje do rozwiązania.<br><br>Proszę otworzyć okno "
+"Konfliktów aby rozwiązać je ręcznie."
+msgstr[2] ""
+"{0} konfliktów pozostaje do rozwiązania.<br><br>Proszę otworzyć okno "
+"Konfliktów aby rozwiązać je ręcznie."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Kliknij aby zamknąć okno i kontynuować edycję"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9799,32 +9844,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "Obiekty na warstwie {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Wersja API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9874,8 +9919,4 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10152,5 +10193,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geolokalizowane obrazy"
@@ -10175,5 +10216,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10205,55 +10246,55 @@
 msgstr "Błąd w pliku {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Usuń zdjęcie z warstwy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Wyśrodkuj widok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10264,5 +10305,5 @@
 "Wysokość: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10331,7 +10372,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Pokaż/Ukryj Tekst/Ikony"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11141,35 +11181,35 @@
 msgstr "Kalibracja urządzenia nagrywającego"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Styl rysowania {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Wybierz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Wybierz kolor dla {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Ustaw na domyślne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Domyślne ustawienie dla wszystkich"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Kolory wykorzystywane przez różne obiekty w JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Kolory"
@@ -11621,17 +11661,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "zablokowane"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11639,5 +11679,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11648,5 +11688,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11663,9 +11703,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11676,5 +11716,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11683,66 +11723,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Zablokuj"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Klucz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Skóry klawiaturowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Edycja skrótów"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Skrótu w menu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr ""
@@ -11805,21 +11845,21 @@
 "aktywne."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Wyświetlaj współrzędne jako"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Rodzaj odwzorowania kartograficznego"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Odwzorowanie kartograficzne"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11864,10 +11904,9 @@
 msgstr "Ręczna zmiana skrótów klawiaturowych."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Akcja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Skrót"
@@ -12342,24 +12381,23 @@
 msgstr "Nieznany typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Nie można odczytać źródła szablonów: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Błąd podczas przetwarzania {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementy typu {0} nie są wspierane."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12370,17 +12408,17 @@
 msgstr[2] "Zmień {0} obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Nic nie wybrano!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Nieodpowiednie zaznaczenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Zastosuj szablon"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Zmień właściwości"
@@ -12891,11 +12929,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13365,5 +13396,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Czytam zestawy zmian..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
@@ -13374,5 +13405,5 @@
 #, java-format
 msgid "Reading changeset {0} ..."
-msgstr ""
+msgstr "Czytam zestaw zmian {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100
@@ -14176,5 +14207,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14187,5 +14218,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14195,5 +14226,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14204,5 +14235,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Podpowiedź: Możesz zmienić skróty klawiszowe w ustawieniach.)"
@@ -14572,15 +14603,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14599,18 +14630,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14777,7 +14808,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Wybierz warstwę docelową"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15301,7 +15331,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "kwatera"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15337,7 +15366,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "opcje"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16544,5 +16572,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
 msgid "Calibration Files"
-msgstr ""
+msgstr "Pliki kalibracji"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
@@ -16573,5 +16601,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:64
 msgid "Image files"
-msgstr ""
+msgstr "Pliki obrazów"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:73
@@ -16589,33 +16617,33 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:45
 msgid "Nothing in clipboard"
-msgstr ""
+msgstr "Schowek jest pusty"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:54
 msgid "The clipboard data is not an image"
-msgstr ""
+msgstr "Dane w schowku nie są obrazem"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
 msgid "PicLayer"
-msgstr ""
+msgstr "PicLayer"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
 msgid "Resets picture calibration"
-msgstr ""
+msgstr "Resetuje kalibrację obrazu"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java:44
 msgid "Resets picture rotation"
-msgstr ""
+msgstr "Resetuje kąt obrotu"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
 msgid "Reset position"
-msgstr ""
+msgstr "Resetuj pozycję"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
 msgid "Resets picture position"
-msgstr ""
+msgstr "Resetuje pozycję obrazu"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
 msgid "Scale"
-msgstr ""
+msgstr "Resetuj skalę"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
@@ -16803,32 +16831,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Wycofaj"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Historia obiektu"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Historia elementu"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Przygotowanie zestawu danych..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Wprowadź ID zestawu zmian"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Błąd: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relacja ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Ostatnia zmiana o {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17064,5 +17093,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17139,16 +17167,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -17994,57 +18022,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Odznacza wszystkie obiekty."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Odznacza wszystkie obiekty."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Wybierz jeśli dane mają być załądowane do nowej warstwy"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Wprowadź ID obiektu który ma zostać pobrany"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Odznacza wszystkie obiekty."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Odznacza wszystkie obiekty."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Rozpocznij pobieranie"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Zamknij okno i porzuć pobieranie"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Plik: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Wczytywanie {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Znaleziono {0} pasujących."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18791,4 +18811,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Widok"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -18908,5 +18938,5 @@
 #, java-format
 msgid "WMS: {0}"
-msgstr ""
+msgstr "WMS: {0}"
 
 #. This service serves the purpose of "just this once" without forcing the user
@@ -18924,5 +18954,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136
 msgid "Visit Homepage"
-msgstr ""
+msgstr "Odwiedź stronę domową"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145
@@ -18972,5 +19002,5 @@
 #, java-format
 msgid "Download WMS tile from {0}"
-msgstr ""
+msgstr "Pobiera kafelki WMS z {0}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
@@ -19003,5 +19033,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
 msgid "Automatic downloading"
-msgstr ""
+msgstr "Automatyczne pobieranie"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:103
@@ -19017,10 +19047,10 @@
 #, java-format
 msgid "WMS layer ({0}), automatically downloading in zoom {1}"
-msgstr ""
+msgstr "Warstwa WMS ({0}), automatycznie pobrana w powiększeniu {1}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:158
 #, java-format
 msgid "WMS layer ({0}), downloading in zoom {1}"
-msgstr ""
+msgstr "Warstwa WMS ({0}), pobrana w powiększeniu {1}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
@@ -19060,26 +19090,26 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
-msgstr ""
+msgstr "Kanał alfa"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
-msgstr ""
+msgstr "Zapisz warstwę WMS do pliku"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
-msgstr ""
+msgstr "Zapisz plik"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
-msgstr ""
+msgstr "Otwórz warstwę WMS z pliku"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
-msgstr ""
+msgstr "Otwórz warstwę WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
-msgstr ""
+msgstr "Nieosługiwana wersja pliku WMS; znaleziono {0}, oczekiwano {1}"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
@@ -19093,5 +19123,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
-msgstr ""
+msgstr "Ustaw zakładkę WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:174
@@ -19101,5 +19131,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:187
 msgid "Open a blank WMS layer to load data from a file"
-msgstr ""
+msgstr "Tworzy pustą warstwę WMS do załadowania danych z pliku"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
@@ -19109,5 +19139,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
 msgid "Modify list of WMS servers displayed in the WMS plugin menu"
-msgstr ""
+msgstr "Zmodyfikuj listę serwerów WMS wyświetlanych w menu wtyczki WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
@@ -19123,5 +19153,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
 msgid "Menu Name (Default)"
-msgstr ""
+msgstr "Nazwa w menu (domyślna)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
@@ -19135,9 +19165,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
 msgid "Copy Selected Default(s)"
-msgstr ""
+msgstr "Kopiuj zaznaczony serwer do menu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
 msgid "Please select at least one row to copy."
-msgstr ""
+msgstr "Wybierz co najmniej jeden wiersz do skopiowania."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
@@ -19160,5 +19190,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
 msgid "WMS Files (*.wms)"
-msgstr ""
+msgstr "Pliki WMS (*.wms)"
 
 #. *
@@ -19198,4 +19228,10 @@
 msgid "You must make your edits public to upload new data"
 msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "na dół"
 
 #. Plugin AddrInterpolation
@@ -19382,7 +19418,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Zamknij otwarte zestawy zmian"
+msgstr ""
 
 #. Plugin routes
@@ -19454,6 +19489,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19464,15 +19507,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19481,5 +19524,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -21040,5 +21083,5 @@
 #: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
-msgstr ""
+msgstr "ścieżka do jazdy konnej"
 
 #. item "Ways/Dedicated Bridleway"
@@ -21052,5 +21095,5 @@
 #: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
-msgstr ""
+msgstr "ścieżka rowerowa"
 
 #. item "Ways/Dedicated Cycleway"
@@ -21080,5 +21123,5 @@
 #: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
-msgstr ""
+msgstr "rozdzielona ścieżka dla pieszych i rowerowa"
 
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
@@ -21086,5 +21129,5 @@
 #: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
-msgstr ""
+msgstr "współdzielona ścieżka dla pieszych i rowerowa"
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
@@ -21092,5 +21135,5 @@
 #: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr ""
+msgstr "ścieżka dla pieszych"
 
 #. item "Ways/Dedicated Footway"
@@ -21099,5 +21142,5 @@
 #: build/trans_presets.java:586
 msgid "Edit Footway"
-msgstr "Edycja drogi dla pieszych"
+msgstr "Edycja ścieżki dla pieszych"
 
 #. item "Ways/Dedicated Footway" text "Width (meters)"
@@ -30960,5 +31003,5 @@
 #: build/trans_style.java:3260
 msgid "farmyard"
-msgstr ""
+msgstr "Gospodarstwo"
 
 #. color farmyard
@@ -31903,5 +31946,5 @@
 #: build/trans_wms.java:35
 msgid "7th Series (OS7)"
-msgstr ""
+msgstr "7th Series (OS7)"
 
 #. http://ooc.openstreetmap.org/wms/map.php?source=os7&
@@ -32015,7 +32058,4 @@
 #~ msgid "Cannot connect to server."
 #~ msgstr "Nie można połączyć się z serwerem."
-
-#~ msgid "Revert"
-#~ msgstr "Wycofaj"
 
 #~ msgid "Download Area"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 21299)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-28 14:39+0000\n"
-"Last-Translator: Vitor George <vitor.george@gmail.com>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-15 18:45+0000\n"
+"Last-Translator: Bráulio Bezerra <Unknown>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Ajuda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorando URL de arquivo mal formada: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,10 +96,10 @@
 msgstr "Aviso"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 "Parâmetro \"downloadgps\" não aceita nomes de arquivos ou URLs de arquivos."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -235,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -252,5 +252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -273,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -285,4 +285,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -340,4 +341,13 @@
 msgstr "Adicionar nó através da entrada de latitude e longitude"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -351,8 +361,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -408,5 +418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -462,5 +472,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -471,7 +481,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -489,7 +500,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -557,28 +568,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Não há nada selecionado para se aproximar."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Aproximar para {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Aproximar a visão para {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Visão: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Não há conflitos para se aproximar"
@@ -671,5 +682,5 @@
 msgstr "Combinar {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Por favor selecione no mínimo 2 caminhos a combinar"
@@ -719,5 +730,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -813,5 +824,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Escolha o tipo de objeto OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -829,5 +840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Baixar objeto"
@@ -873,5 +884,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -1001,25 +1012,25 @@
 msgstr "Não foi encontrada intersecção. Nada foi alterado."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Nó adicionado em todas intersecções"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Eliminar caminhos que não fazem parte de um multipolígono interior"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Consertar relações"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Fundir área sobreposta consigo mesma"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Fundir áreas sobrepostas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1029,33 +1040,33 @@
 "verifique se não foram introduzidos erros."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Entrada de valores para todos conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Resolver conflitos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Consertar conflito de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Eliminar elementos de relações"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Juntas Áreas: Remover Caminhos Curtos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Vía Fechada"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Eliminar etiquetas de caminhos internos"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Função Juntar Áreas"
@@ -1074,5 +1085,5 @@
 msgstr "Unir Nó e Linha"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Sem atalho"
@@ -1541,8 +1552,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1552,5 +1563,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1969,20 +1980,27 @@
 msgstr "Desfazer última ação."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Desmarcar todos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Desmarcar todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Desmarcar tudo (Focar)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Desmarcar tudo (Sair)"
@@ -2108,16 +2126,12 @@
 msgstr "Mudar para visão Wireframe"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Aproximar"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Afastar"
@@ -2337,9 +2351,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2356,52 +2370,52 @@
 "usados ao apagar um caminho. Ctrl: apaga  objetos referentes."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Desenhar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Desenhar nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Modo: Desenhar Foco"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Não é possível adicionar nó fora do planeta."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Adicionar nó"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Adicionar nó no caminho"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Conectar caminho existente a nó"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Adicionar um novo nó a um caminho existente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Adicionar nó em um caminho e conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Criar novo nó."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Selecionar nó sob o cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2410,14 +2424,14 @@
 msgstr[1] "Inserir novo nó em {0} caminhos."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Começar novo caminho a partir do último nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Continuar caminho a partir do último nó."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Finalizar desenho."
@@ -2984,5 +2998,5 @@
 msgstr "Adicionar relação {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3906,5 +3920,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "selecionado"
@@ -3935,5 +3949,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "segundo plano"
@@ -4019,9 +4033,9 @@
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poland)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4120,6 +4134,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4238,38 +4252,38 @@
 "Era esperado um valor não-vazio para o parâmetro ''{0}'', mas recebi ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Enviar Preferências"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Enviar as preferências atuais para o servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "sequência de texto"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Nome do usuário"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Senha do OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Redimensionar applet para geometria dada (formato: LARGURA x ALTURA)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "string;string;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4279,5 +4293,5 @@
 "um arquivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4287,5 +4301,5 @@
 "lat=y&lon=x&zoom=z ou um nome de arquivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4295,47 +4309,47 @@
 "Google ou uma URL que retorne um osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "qualquer"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Se especificado, resetar configuração ao invés de carregá-la."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nome do Usuário"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Senha"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uso"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opções"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Mostar essa ajuda"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argumento padrão de geometria unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Baixar o retângulo limite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
@@ -4343,41 +4357,41 @@
 "Abrir)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Baixar o retângulo limite como dados de gps brutos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Baixar o local da url (com lat=x&lon=y&zoom=z) como dados raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Selecionar dentro da busca"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Executar em modo maximizado"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Resetar preferência para default"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Definir o idioma"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "opções providas como propriedades do sistema Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/TRILHA/PARA/PASTA/DO/JOSM/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Alterar o diretório para todas as configurações de usuário"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4391,9 +4405,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exemplos"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4403,37 +4417,37 @@
 "ordem."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Tenha certeza de que irá carregar algum dado, caso use --selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Inicializando"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Atualizando plugins..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Instalando plugins atualizados"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Carregando plugins anteriores"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Aplicando padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Criando tela principal"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Carregando plugins"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4446,5 +4460,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4570,10 +4584,10 @@
 msgstr "Usuário:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "camada não está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -5023,5 +5037,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5280,5 +5294,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5286,7 +5300,7 @@
 "you agree?</html>"
 msgstr ""
-"<html>Para manter a versão local, o JOSM<br>precisa resetar o id do "
-"primitivo {0} para zero.<br>No próximo envio o servidor irá designar<br>um "
-"novo id para ele.<br>De acordo?</html>"
+"<html>Para manter sua versão local, o JOSM<br>tem que resetar o ID da "
+"primitiva {0} para zero.<br>Na próximo envio, o servidor vai atribuir<br>um "
+"novo ID.<br>Você concorda?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5539,6 +5553,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5549,5 +5563,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5859,5 +5873,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5910,7 +5924,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
-#, fuzzy, java-format
+#, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Filtro Oculto: {0} Desabilitado: {0}"
+msgstr "Filtro Escondido: {0} Desabilitado: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -5932,5 +5946,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Recarregar"
@@ -5986,9 +6000,9 @@
 msgstr "Duplicar esta camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Mover a camada selecionada uma linha acima."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Mover camada selecionada uma linha abaixo."
@@ -7131,8 +7145,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7810,55 +7824,55 @@
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriedades: {0} / Membros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Propriedades / Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Modificar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Deletar da relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Confirmar a exclusão da relação {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Excluir a chave selecionada em todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Adicionar um novo par chave/valor para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da chave selecionada para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Selecionar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Selecione a relação na seleção principal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Selecionar na lista de relações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Selecionar uma relação na lista de relações"
@@ -8530,5 +8544,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Limites"
@@ -8560,21 +8574,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer exception, provavelmente faltam algumas tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Buscar ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Clique para começar a buscar locais"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Consultando o servidor de nomes"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Consultando o servidor de nomes ..."
@@ -8596,5 +8610,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8608,5 +8622,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8642,14 +8656,14 @@
 msgstr "Número de quadros"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "Falha ao ler o arquivo CSS \"help-browser.css\". A exceção foi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "Navegador de Help do JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8662,6 +8676,13 @@
 "a>.</p></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+"<html><p class=\"warning-header\">Conteúdo de ajuda para o tópico não "
+"existe</p><p class=\"warning-body\">O conteúdo do tópico de ajuda <strong>{0}"
+"</strong> ainda não está disponível. Ele está faltando tanto na sua língua "
+"local ({1}) como em inglês.<br><br>Por favor ajude a melhorar o sistema de "
+"ajuda do JOSM inserindo a informação que está faltando. Você pode tanto "
+"editar o <a href=\"{2}\">tópico de ajuda no seu idioma ({1})</a> ou o <a "
+"href=\"{3}\">tópico de ajudo em inglês</a>.</p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8916,4 +8937,6 @@
 "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
+"Não foi possível atualizar a primitiva com ID {0} porque a camada de edição "
+"ativa é nula."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
@@ -8965,5 +8988,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Conflitos detectados"
@@ -9759,7 +9782,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Enviando {0} objetos..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Enviando {0} objeto..."
+msgstr[1] "Enviando {0} objetos..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9928,4 +9954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "ponto GPS"
@@ -10094,5 +10121,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10156,18 +10183,18 @@
 msgstr "Camada de dados {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "fora da área baixada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "versão {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "Atenção: misturando dados de versões 0.6 e 0.5 na versão 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10176,5 +10203,5 @@
 msgstr[1] "Houve {0} conflitos detectados."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10188,5 +10215,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10203,11 +10230,11 @@
 "Lista de Conflitos e resolva-os manualmente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Clique para fechar essa janela e continuar editando"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10216,32 +10243,32 @@
 msgstr[1] "{0} removidos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consiste em:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "remover definição"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Versão API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Converter para camada GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Teste de consistência de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "Nenhum problema encontrado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Foi encontrado os seguintes problemas:"
@@ -10287,8 +10314,4 @@
 msgstr[1] "{0} pontos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "Pontos GPS"
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10565,5 +10588,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagens Geotagueadas"
@@ -10588,5 +10611,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Remover arquivo de imagem do disco"
@@ -10618,55 +10641,55 @@
 msgstr "Erro no arquivo {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Mostrar imagens com tags geográficas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Mostrar imagem anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Geoimagem: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Remover foto da camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Apagar arquivo do disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Próximo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Mostrar a próxima imagem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centralizar vista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10677,5 +10700,5 @@
 "Altitude: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10744,7 +10767,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Mostrar/Esconder Texto/Ícones"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11585,35 +11607,35 @@
 msgstr "Calibração do gravador de voz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Escolher"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Escolha uma cor para {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Definir para padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Definir todos para padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Cores utilizadas por diferentes objetos no JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Cores"
@@ -12069,17 +12091,17 @@
 msgstr "URL de descrição do plugin do JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "desabilitado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "sem modificador"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Atalhos de teclado</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12087,5 +12109,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12096,5 +12118,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12111,9 +12133,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12124,5 +12146,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12131,66 +12153,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Leia Primeiro"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Usar padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Desativar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Chave:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Atenção use apenas teclas reais do teclado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Atalhos de teclado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Editar Atalhos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Modificador primário:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Modificador secundário:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Modificador terciário:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Atalhos de Menu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Atalhos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Atalhos de subjanelas"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Grupos Modificadores"
@@ -12253,21 +12275,21 @@
 msgstr "Você precicar reiniciar JOSM para aplicar mudanças."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Mostra coordinados como"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Método de Projeção"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Código de Projeção"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Projeção do Mapa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12312,10 +12334,9 @@
 msgstr ""
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Ação"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Atalho"
@@ -12805,24 +12826,23 @@
 msgstr "Tipo desconhecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analisando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elementos do tipo {0} são suportados."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12832,17 +12852,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Nada selecionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Seleção inadequada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Aplicar Preferência"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Alterar propriedades"
@@ -13361,11 +13381,4 @@
 msgid "Preparing upload request..."
 msgstr "Preparando requisição de envio..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Enviando {0} objeto..."
-msgstr[1] "Enviando {0} objetos..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13817,7 +13830,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(na linha{0}, coluna {1})"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -14660,5 +14673,5 @@
 msgstr "não usado"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14671,5 +14684,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14679,5 +14692,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14688,5 +14701,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Dica: Você pode editar atalhos em preferências.)"
@@ -15066,15 +15079,15 @@
 msgstr "Números:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Criar um prédio"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15093,18 +15106,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -15273,7 +15286,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Selecionar camada WMS"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15836,7 +15848,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Opcional"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15863,7 +15874,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Decremento"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -17302,32 +17312,34 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #, fuzzy
-msgid "Objects history"
-msgstr "Histórico do objeto"
+msgid "Revert"
+msgstr "Inverter"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "History reverter"
-msgstr "Historia do iten"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Preparando dados OSM..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Pesquisar conjuntos de modificações"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Erro: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relação ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Exibir changeset {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17563,5 +17575,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17638,16 +17649,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -18528,57 +18539,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Apagar objetos"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Apagar objetos"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Indique se os dados devem ser baixados em uma nova camada"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Entre com o ID do objeto que deve ser baixado"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Apagar objetos"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Apagar objetos"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Começar o download"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Feche a mensagem e cancele a transferência"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Arquivo: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Carregando {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Nó {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19328,4 +19331,14 @@
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Locadora de Vídeo"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19736,4 +19749,10 @@
 msgstr "Você deve tornar suas edições públicas para enviar novos dados"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "abaixo"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19923,7 +19942,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Abrir a janela de pesquisa de conjuntos de modificações"
+msgstr ""
 
 #. Plugin routes
@@ -19995,6 +20013,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20003,15 +20029,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20020,5 +20046,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32482,4 +32508,10 @@
 msgstr "Sicilia - Italia"
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Enviando {0} objetos..."
+
+#~ msgid "GPS point"
+#~ msgstr "Pontos GPS"
+
 #~ msgid "Preparing..."
 #~ msgstr "Preparando..."
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 21299)
+++ applications/editors/josm/i18n/po/ro.po	(revision 21304)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-24 22:47+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 10:30+0000\n"
 "Last-Translator: Adi Roiban <adi@roiban.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -24,5 +24,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -35,12 +35,12 @@
 msgstr "_Ajutor"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Se ingoră fişierul URL prost format: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -79,5 +79,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -100,9 +100,9 @@
 msgstr "Avertisment"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -122,8 +122,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -229,5 +229,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -279,4 +279,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -334,4 +335,13 @@
 msgstr "Adaugă un nod prin introducerea latitudinii şi longitudinii"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -345,8 +355,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -402,5 +412,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -456,5 +466,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -465,7 +475,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -483,7 +494,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -551,28 +562,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Apropie la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Apropie vederea la {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Vedere: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr ""
@@ -663,5 +674,5 @@
 msgstr "Combină {0} căi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Selectează te rog cel puţin două căi pentru a le combina."
@@ -711,5 +722,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -820,5 +831,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr ""
@@ -863,5 +874,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -990,25 +1001,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1016,33 +1027,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Introdu valori pentru toate conflictele."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Rezolvă Conflictele"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr ""
@@ -1061,5 +1072,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr ""
@@ -1499,8 +1510,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1510,5 +1521,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1906,20 +1917,27 @@
 msgstr "Anulează ultima acţiune."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr ""
@@ -2038,16 +2056,12 @@
 msgstr ""
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Apropie"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Apropie"
@@ -2257,9 +2271,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2274,52 +2288,52 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Adaugă nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
+msgid "Connect existing way to node"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
-msgid "Connect existing way to node"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add a new node to an existing way"
 msgstr "Adaugă nod nou la o cale existentă"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Creează nod nou"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
 #, java-format
 msgid "Insert new node into way."
@@ -2328,14 +2342,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr ""
@@ -2852,5 +2866,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3718,5 +3732,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "selectat"
@@ -3747,5 +3761,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "fundal"
@@ -3829,9 +3843,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3929,6 +3943,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4046,38 +4060,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "şir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Numele utilizatorului."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Parola OSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "şir;şir;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4085,5 +4099,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4091,5 +4105,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4097,87 +4111,87 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "oricare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Dacă este specificat, resetează configuraţia în loc de a o citi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Parolă"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "utilizare"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "opţiuni"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Arată acest ajutor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Argument geometrie unix standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Descarcă perimetrul selectat"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Descarcă locaţia de la adresă (cu lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Descarcă perimetrul selectat ca date gps neprelucrate"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Selectează cu căutarea dată"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Restabileşte preferinţele implicite"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4187,9 +4201,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exemple"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4197,37 +4211,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Se creează interfața grafică"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4240,5 +4254,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4362,10 +4376,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "stratul nu este în listă."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4778,5 +4792,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5264,6 +5278,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5274,5 +5288,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5552,5 +5566,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5625,5 +5639,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Reîncarcă"
@@ -5679,9 +5693,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Mută stratul selectat un rând în sus."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Mută stratul selectat un rând în jos."
@@ -6807,8 +6821,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7427,55 +7441,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+msgid "Delete from relation"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8101,5 +8115,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8131,21 +8145,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8167,5 +8181,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8179,5 +8193,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8213,14 +8227,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8234,5 +8248,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8520,5 +8534,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9256,7 +9270,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9413,4 +9430,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "punct gps"
@@ -9577,5 +9595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9637,18 +9655,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9657,5 +9675,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9669,5 +9687,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9680,11 +9698,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9693,32 +9711,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} constă în:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9768,8 +9786,4 @@
 msgstr[2] "{0} de puncte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10044,5 +10058,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Imagini geoetichetate"
@@ -10067,5 +10081,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10097,55 +10111,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10154,5 +10168,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -11024,35 +11038,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Culoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Alegeţi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Alegeţi o culoare pentru {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Culori utilizate de diferite obiecte în JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Culori"
@@ -11497,17 +11511,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11515,5 +11529,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11524,5 +11538,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11539,9 +11553,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11552,5 +11566,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11559,66 +11573,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr ""
@@ -11681,21 +11695,21 @@
 msgstr "Trebui să reponiţi JOSM pentru ca anumite opţiuni să aibă efect."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Metodă de proiecţie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11740,10 +11754,9 @@
 msgstr ""
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr ""
@@ -12217,24 +12230,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Eroare la prelucrarea {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12245,17 +12257,17 @@
 msgstr[2] "Schimb {0} de obiecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Modificare proprietăţi"
@@ -12762,11 +12774,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14038,5 +14043,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14046,5 +14051,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14052,5 +14057,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14059,5 +14064,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr ""
@@ -14427,15 +14432,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14454,18 +14459,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14632,7 +14637,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Selectați stratul țintă"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15191,7 +15195,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "opţiuni"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16651,12 +16654,15 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #, fuzzy
-msgid "Objects history"
-msgstr "Obiecte de adăugat:"
+msgid "Revert"
+msgstr "Elimină"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
 msgid "History reverter"
-msgstr "Istoric"
+msgstr ""
 
 #: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
@@ -16665,16 +16671,17 @@
 
 #: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 msgid "Revert changeset"
 msgstr ""
 
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, java-format
-msgid "reverter: {0}"
-msgstr ""
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
+#, fuzzy
+msgid "Reverting..."
+msgstr "Citesc {0}..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Ultima modificare la {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -16910,5 +16917,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -16985,16 +16991,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -17840,7 +17846,6 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Șterge obiectele selectate."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
@@ -17861,7 +17866,6 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Șterge obiectele selectate."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
@@ -17879,12 +17883,12 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Imagini pentru {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Versiune {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18628,4 +18632,14 @@
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Vizualizare"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19034,4 +19048,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "la"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19288,6 +19308,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19296,15 +19324,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19313,5 +19341,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -31875,7 +31903,4 @@
 #~ msgstr "fals"
 
-#~ msgid "to"
-#~ msgstr "la"
-
 #~ msgid "different"
 #~ msgstr "diferit"
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 21299)
+++ applications/editors/josm/i18n/po/ru.po	(revision 21304)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-08 05:25+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-14 18:30+0000\n"
 "Last-Translator: Calibrator <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:53+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -23,5 +23,5 @@
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -34,12 +34,12 @@
 msgstr "Справка"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Игнорирование неправильной ссылки на файл: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -78,5 +78,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -99,9 +99,9 @@
 msgstr "Предупреждение"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Параметр \"downloadgps\" не принимает имена или URL-адреса файлов"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -121,8 +121,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -235,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -252,5 +252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -273,5 +273,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -285,4 +285,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -342,4 +343,13 @@
 msgstr "Добавить точку, указав её широту и долготу"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -353,8 +363,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -410,5 +420,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -464,5 +474,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -473,7 +483,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -491,7 +502,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -560,28 +571,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Ничего не выделено для масштабирования."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Масштабировать до {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Приблизить вид до {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Вид: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Нет конфликтов чтобы их приблизить"
@@ -674,5 +685,5 @@
 msgstr "Объединить {0} линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Выделите не менее двух линий для объединения."
@@ -721,5 +732,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -814,5 +825,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
 msgid "Choose the OSM object type"
-msgstr ""
+msgstr "Выберите тип объекта OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
@@ -830,5 +841,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Скачать объект"
@@ -873,5 +884,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -1003,25 +1014,25 @@
 msgstr "Пересечений не найдено. Изменений сделано не было."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Добавлены точки на всех пересечениях"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Удалить линии, которые не являются внутренней частью мультиполигона"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Исправить отношения"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Присоединённая самоперекрывающаяся область"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Объединённые наложенные полигоны"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1031,33 +1042,33 @@
 "Пожалуйста, проверьте не появились ли ошибки."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Введите значения для всех конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Уладить конфликты"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Уладить конфликты тегов"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Удалённый из отношений элемент"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Объединить полигоны: короткие линии удаляются"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Замкнутая линия"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Удалить теги у внутренних линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Функция объединения полигонов"
@@ -1076,5 +1087,5 @@
 msgstr "Включить точку в линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Нет ярлыка"
@@ -1547,8 +1558,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1558,5 +1569,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1984,20 +1995,27 @@
 msgstr "Отменить последнее действие."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Снять выделение"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Снять выделение со всех объектов."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Снять выделение со всего (Фокус)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Снять выделение со всего (Escape)"
@@ -2120,16 +2138,12 @@
 msgstr "Показать/скрыть каркас"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Увеличить масштаб"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Уменьшить масштаб"
@@ -2351,9 +2365,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2371,52 +2385,52 @@
 "объекты."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Рисовать"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Рисовать точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Режим: Рисование фокуса"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Точка не может быть добавлена за пределами мира."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Добавить точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Вставить точку в линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Присоединить линию к точке"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Добавить новую точку к линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Добавить точку к линии и объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Создать новую точку"
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Выделить точку под курсором."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2426,14 +2440,14 @@
 msgstr[2] "Вставить новую точку в {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Начать новую линию с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Продолжить линию с последней точки"
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Закончено вычерчивание"
@@ -3010,5 +3024,5 @@
 msgstr "Добавить отношение {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3856,5 +3870,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:267
 msgid "More than one \"from\" way found."
-msgstr "Обнаружена больше чем одна линия \"от\""
+msgstr "Обнаружена больше чем одна линия \"from\" (откуда)"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:273
@@ -3880,5 +3894,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
 msgid "No \"from\" way found."
-msgstr "Не найдена линия \"от\""
+msgstr "Не найдена линия \"from\" (откуда)"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:311
@@ -3941,5 +3955,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "выделено"
@@ -3970,5 +3984,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "фон"
@@ -4054,9 +4068,9 @@
 msgstr "Зона PUWG"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Польша))"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4155,6 +4169,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4274,38 +4288,38 @@
 msgstr "Ожидалось непустое значение для параметра ''{0}'', получено ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Передать настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Передать текущие настройки на сервер"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "строка"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Имя пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Пароль OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Изменить размер апплета на заданный (формат: ШИРИНАxВЫСОТА)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "строка;строка;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4315,5 +4329,5 @@
 "lat=y&lon=x&zoom=z, либо название файла"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4323,5 +4337,5 @@
 "URL, содержащая lat=y&lon=x&zoom=z, либо название файла"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4331,88 +4345,88 @@
 "ссылкой, которая возвращает osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "любое"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Если выбрано - установить настройки по умолчанию."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Пароль"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "использование"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "опции"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Показать эту справку"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Стандартный параметр геометрии unix"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Скачать область в пределах рамки"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Скачать область по ссылке (с параметрами lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Открыть файл (любой тип файлов, который можно открыть с помощью Файл/Открыть)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Скачать область в пределах рамки, как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Скачать расположение с URL (с lat=x&lon=y&zoom=z) как данные GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Выбор с учетом поиска"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Запуск в развернутом виде"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Восстановить настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Указать язык"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "системные настройки Java"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "Сменить папку для всех настроек пользователя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4426,9 +4440,9 @@
 "максимальный размер выделенной памяти"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "примеры"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4438,5 +4452,5 @@
 "порядке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
@@ -4444,33 +4458,33 @@
 "selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Инициализация"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Обновление модулей..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Установка обновлённых модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Загрузка ранних модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Настройки по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Создание интерфейса"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Загрузка модулей"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4485,5 +4499,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4609,10 +4623,10 @@
 msgstr "Пользователь:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "слоя нет в списке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -5060,5 +5074,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5324,5 +5338,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5330,7 +5344,7 @@
 "you agree?</html>"
 msgstr ""
-"<html>Чтобы спасти вашу локальную версию, JOSM<br>сбросит значение id "
-"элемента {0} в 0.<br>При очередной загрузке на сервер,<br>id элемента "
-"получит новое значение.<br>Вы согласны?</html>"
+"<html>Чтобы сохранить вашу локальную версию, JOSM<br>сбросит id элемента {0} "
+"в 0.<br>При следующей загрузке, сервер назначит<br>ему новый id.<br>Вы "
+"согласны?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5585,6 +5599,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5596,5 +5610,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5900,5 +5914,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5951,7 +5965,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
-#, fuzzy, java-format
+#, java-format
 msgid "Filter Hidden:{0} Disabled:{1}"
-msgstr "Фильтр Спрятано: {0} Отключено: {0}"
+msgstr "Фильтром спрятано:{0}, отключено:{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
@@ -5973,5 +5987,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Обновить"
@@ -6027,9 +6041,9 @@
 msgstr "Дублировать этот слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Переместить выделенный слой вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Переместить выделенный слой вниз."
@@ -7172,8 +7186,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7842,55 +7856,55 @@
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойств: {0} / Участников: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Параметры / Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Удалить из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выделенный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Удалить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Выбрать отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Выберите отношение в основном выборе."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Выбрать в списке отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Выбрать отношение в списке отношений."
@@ -8580,5 +8594,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Границы"
@@ -8610,21 +8624,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Пустой указатель ошибки, возможно есть отсутствующие теги"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Найти ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Нажмите, чтобы начать поиск мест"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Запрос на сервер имён"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Запрос на сервер имён ..."
@@ -8646,5 +8660,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8658,5 +8672,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8692,14 +8706,14 @@
 msgstr "Номера квадратов"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "Не удалось прочитать файл CSS ''help-browser.css''. Текст ошибки: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "Браузер справки JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8720,5 +8734,5 @@
 "английском</a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -9035,5 +9049,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Обнаружены конфликты"
@@ -9899,7 +9913,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "Передача объектов на сервер. Кол-во: {0}..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Загрузка на сервер {0} объекта..."
+msgstr[1] "Загрузка на сервер {0} объектов..."
+msgstr[2] "Загрузка на сервер {0} объектов..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -10076,4 +10094,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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"
@@ -10251,5 +10270,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10317,19 +10336,19 @@
 msgstr "Слой данных {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "вне области для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 "Внимание: совместное использование данных версий 0.6 и 0.5 в версии 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10339,5 +10358,5 @@
 msgstr[2] "Обнаружено {0} конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10361,5 +10380,5 @@
 "сервере."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10379,11 +10398,11 @@
 "конфликтов и уладьте конфликты вручную."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10393,32 +10412,32 @@
 msgstr[2] "{0} удалено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} состоит из:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "отключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Версия API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Преобразовать в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Тест согласованности набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "Проблемы не обнаружены"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Обнаружены следующие проблемы:"
@@ -10472,8 +10491,4 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "точка GPS"
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10764,5 +10779,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Изображения с данными о местоположении"
@@ -10789,5 +10804,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Удалить изображение с диска"
@@ -10821,55 +10836,55 @@
 msgstr "Ошибка в файле {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Показать изображение с геотегами"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Предыдущее"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Показать предыдущее изображение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Геоизображение: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Удалить фото из слоя"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Удалить файл с диска"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Следующее"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Показать следующее изображение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Центрировать вид"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Масштабировать, чтобы вписать с соотношением сторон 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "Передвинуть диалог на боковую панель"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10880,5 +10895,5 @@
 "Высота: {0} м"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10952,7 +10967,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Показать/скрыть текст/значки"
+msgstr "Показать Текст/Пиктограммы"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11878,35 +11892,35 @@
 msgstr "Калибровка звукозаписи"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Цвет"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Стиль рисования {0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Выбрать"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Выберите цвет для {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Установить значение по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Установить все значения по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Цвета, используемые разными объектами в JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Цвета"
@@ -12373,17 +12387,17 @@
 msgstr "Ссылка на описание модуля JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "отключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "нет модификатора"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Горячие клавиши</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12394,5 +12408,5 @@
 "изменения.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12408,5 +12422,5 @@
 "здесь.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12436,9 +12450,9 @@
 "клавиатуре US.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Группы модификаторов</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12454,5 +12468,5 @@
 "клавиш окажутся уже занятыми, будет назначена случайная горячая клавиша.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12461,66 +12475,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Читать первым"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Использовать значение по умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Отключить"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Клавиша:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Внимание: Используйте только присутствующие на клавиатуре клавиши!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Горячие клавиши"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Редактировать горячие клавиши"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Основной модификатор:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Второй модификатор:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Третий модификатор:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Горячие клавиши меню"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Горячие клавиши"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Горячие клавиши подменю"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Группы модификаторов"
@@ -12581,21 +12595,21 @@
 msgstr "Необходимо перезапустить JOSM, чтобы изменения вступили в силу."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Отображать координаты как"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Тип проекции"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Код проекции"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Картографическая проекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12641,10 +12655,9 @@
 msgstr "Изменить сочетания клавиш вручную"
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Действие"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Горячая клвиша"
@@ -13179,24 +13192,23 @@
 msgstr "Неизвестный тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Не удалось прочитать источник заготовок тегов: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Ошибка при разборе {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Элемент типа {0} не поддерживается."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13207,17 +13219,17 @@
 msgstr[2] "Изменить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Ничего не выделено!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Неудачный выбор!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Применить заготовку"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Изменить параметры"
@@ -13763,12 +13775,4 @@
 msgid "Preparing upload request..."
 msgstr "Подготовка запроса загрузки на сервер..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Загрузка на сервер {0} объекта..."
-msgstr[1] "Загрузка на сервер {0} объектов..."
-msgstr[2] "Загрузка на сервер {0} объектов..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14120,7 +14124,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "Отсутствует нужный атрибут ''{0}''."
+msgstr "В теге отсутствует ключ или значение атрибута."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -14265,7 +14268,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(строка {0}, столбец {1})"
+msgstr "Строка {0} столбец {1}: "
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -15225,5 +15228,5 @@
 msgstr "не задействовано"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -15236,5 +15239,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -15244,5 +15247,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15253,5 +15256,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Подсказка: Горячие клавиши можно назначить в настройках)"
@@ -15645,15 +15648,15 @@
 msgstr "Номера:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr "Невозможно поместить здание за пределами мира"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Создать здание"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15672,18 +15675,18 @@
 msgstr "Шаг длины:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr "Рисовать здания"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr "Укажите угол здания чтобы начать отрисовку"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr "Укажите противоположный конец здания"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "Задайте ширину здания"
@@ -15866,7 +15869,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Выбрать слой WMS"
+msgstr "Сначала выберите слой WMS в списке."
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16311,5 +16313,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
 msgid "Extract commune boundary"
-msgstr "Извлечь общие границы"
+msgstr "Извлечь границы общины"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
@@ -16418,7 +16420,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Домик для гостей"
+msgstr "Я использую мышь"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -16456,7 +16457,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Необязательно"
+msgstr "(не обязательно)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16485,11 +16485,10 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Уменьшать"
+msgstr "Департамент"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
 msgid "<html>Departement number (optional)</html>"
-msgstr ""
+msgstr "<html>Номер департамента (не обязательно)</html>"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
@@ -17058,5 +17057,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
-msgstr "Максимальное количество точек на начальном треке"
+msgstr "Максимальное количество точек на эскизе"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
@@ -17086,5 +17085,5 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
-msgstr "Направление для поиска места"
+msgstr "Направление для поиска суши"
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
@@ -17126,6 +17125,6 @@
 "in the range 0-255. Default 90."
 msgstr ""
-"Максимальнj серое значение принято для обозначения воды (на основе данных "
-"Лэндсат IR-1). Может быть в диапазоне 0-255. По умолчанию 90."
+"Максимальное значение серого для обозначения воды (на основе данных Landsat "
+"IR-1). Может быть в диапазоне 0-255. По умолчанию 90."
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
@@ -17358,9 +17357,9 @@
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79
 msgid "Please select 4 ways that form a closed relation."
-msgstr "Пожалуйста, выделите 4 линии, которые по форме - закрытое отношение."
+msgstr "Пожалуйста, выделите 4 линии, которые образуют закрытое отношение."
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106
 msgid "Unable to order the ways. Please verify their directions"
-msgstr "Невозможно выстроить линии. Пожалуйста, проверьте их направление"
+msgstr "Невозможно упорядочить линии. Пожалуйста, проверьте их направление"
 
 #: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120
@@ -17430,5 +17429,5 @@
 "<html>Модуль openstreetbugs использует старый сервер appspot.com.<br>Новый "
 "сервер доступен на schokokeks.org.<br>Хотите переключится на новый сервер? "
-"(Строго рекомендуется)</html>"
+"(Настоятельно рекомендуется)</html>"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
@@ -17804,10 +17803,10 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81
 msgid "JOSM PicLayer plugin calibration data"
-msgstr "Модуль JOSM для калибровки данных PicLayer"
+msgstr "Данные калибровки модуля JOSM PicLayer"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:85
 #, java-format
 msgid "Saving file failed: {0}"
-msgstr "Сохранение файла не удалось: {0}"
+msgstr "Не удалось сохранить файл: {0}"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
@@ -17833,5 +17832,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
 msgid "Drag to scale the picture in the Y Axis"
-msgstr "Тащите, чтобы масштабировать изображение оп оси Y"
+msgstr "Тащите, чтобы масштабировать изображение по оси Y"
 
 #. item "Bicycle/Rental" text "Name"
@@ -17843,9 +17842,9 @@
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:409
 msgid "Route patterns ..."
-msgstr "Палитры маршрутов ..."
+msgstr "Шаблоны маршрутов …"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:410
 msgid "Edit Route patterns for public transport"
-msgstr "Править палитры маршрутов общественного транспорта"
+msgstr "Править шаблоны маршрутов общественного транспорта"
 
 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:422
@@ -17961,5 +17960,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234
 msgid "Remote Control has been asked to create a new node."
-msgstr "Пультом управления было предложено создать новую точку."
+msgstr "Модулем дистанционного управления было предложено создать новую точку."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246
@@ -17972,32 +17971,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr "История объектов"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Откатить"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr "Откатчик истории"
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr "Подготовка данных истории..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr "Откатить пакет правок"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "История элемента"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Пункт истории"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Разбор данных истории OSM..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Запрос пакетов правок"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "предлагается: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Отношение ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Показать пакет правок {0}"
+msgstr "Откатить пакет правок #{0}"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18138,5 +18138,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
 msgid "Flush Tile Cache"
-msgstr "Очистить кеш квадрата карты"
+msgstr "Очистить кеш квадратов карты"
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
@@ -18217,22 +18217,21 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr "Инспектор..."
+msgstr "Землемер…"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
 msgid "Open surveyor tool."
-msgstr "Открыть инспектор."
+msgstr "Открыть землемер."
 
 #. surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
 msgid "Surveyor"
-msgstr "Инспектор"
+msgstr "Землемер"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
 #, java-format
 msgid "Could not read surveyor definition: {0}"
-msgstr "Не удалось прочитать определение инспектора: {0}"
+msgstr "Не удалось прочитать определение землемера: {0}"
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -18310,11 +18309,11 @@
 msgstr "неожиданный номер столбца {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Анализатор заготовок тегов"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -18323,5 +18322,5 @@
 "просмотра этих тегов."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -18497,6 +18496,6 @@
 "relation representing this turn restriction."
 msgstr ""
-"В следующей таблице вы можете редактировать <strong>теги построчно</strong>, "
-"внутри отношения OSM, определяющего данное ограничение на поворот."
+"В следующей таблице вы можете редактировать <strong>необработаные теги</"
+"strong>, внутри отношения OSM, определяющего данное ограничение на поворот."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
@@ -18505,6 +18504,7 @@
 "OSM relation representing this turn restriction."
 msgstr ""
-"В следующей таблице вы можете редактировать <strong>участников построчно</"
-"strong>, внутри отношения OSM, определяющего данное ограничение на поворот."
+"В следующей таблице вы можете редактировать <strong>необработаных "
+"участников</strong>, внутри отношения OSM, определяющего данное ограничение "
+"на поворот."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
@@ -18565,5 +18565,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
 msgid "Edit the raw tags and members of this turn restriction"
-msgstr "Править теги построчно и участников этого ограничения на поворот"
+msgstr "Править необработанные теги и участников этого ограничения на поворот"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:141
@@ -19060,9 +19060,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47
 msgid "Delete ''to''"
-msgstr "Удалить ''куда''"
+msgstr "Удалить ''to''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48
 msgid "Removes the member with role ''to''"
-msgstr "Удаляет участника с ролью ''to''"
+msgstr "Удаляет участника с ролью ''to'' (куда)"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57
@@ -19080,6 +19080,6 @@
 "Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
 msgstr ""
-"Перейти к Основному редактору и вручную выбрать участников с ролями ''from'' "
-"и ''to''"
+"Перейти к Основному редактору и вручную выбрать участников с ролями "
+"''from'' (откуда) и ''to'' (куда)"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27
@@ -19269,57 +19269,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Удалить объекты"
+msgstr "Восстановить объект..."
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Удалить объекты"
+msgstr "Восстановить объект по id"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Вы делите данные, которые должны быть скачаны в новый слой"
+msgstr "Выделите, если данные должны быть добавлены в новый слой"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Введите ID объекта, который должен быть скачан с сервера"
+msgstr "Введите ID объекта, который хотите восстановить"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Удалить объекты"
+msgstr "Восстановить объект"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Удалить объекты"
+msgstr "Восстановить объект"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Начало выравнивания"
+msgstr "Начать восстановление"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Закрыть диалог и отменить скачивание"
+msgstr "Зактрыть диалог и отменить"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Файл: {0}"
+msgstr "Ожидается получить {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Загрузка {0}"
+msgstr "Поиск для {0}"
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Точка {0}"
+msgstr "Найдено {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -20087,4 +20079,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Видео"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -20531,4 +20533,10 @@
 "сервер"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "вниз"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -20750,7 +20758,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Открыть диалог запроса пакетов правок"
+msgstr "Модуль для отката пакетов правок"
 
 #. Plugin routes
@@ -20814,16 +20821,15 @@
 #. Plugin turnrestrictions
 #: build/trans_plugins.java:81
-#, fuzzy
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
 msgstr ""
-"Модуль turnrestrictions позволяет создавать и редактировать ограничения "
-"движения в базе данных OpenStreetMap."
+"Модуль Turnrestrictions позволяет ввести основную информацию об ограничениях "
+"на поворот в базу данных OpenStreetMap."
 
 #. Plugin undelete
 #: build/trans_plugins.java:83
 msgid "Allows undeleting object from OSM database"
-msgstr ""
+msgstr "Позволяет восстанавливать объекты, удаленные из базы данных OSM"
 
 #. Plugin validator
@@ -20837,6 +20843,14 @@
 "правописание имён тегов."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20847,15 +20861,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Быстрое скачивание вдоль большого набора связанных линий"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Выделить последовательность неветвящихся соединённых линий"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20867,5 +20881,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -33330,9 +33344,12 @@
 msgstr "Sicily - Италия"
 
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Автоматический выбор первого слоя WMS во время захвата, если слоёв "
-#~ "несколько."
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Передача объектов на сервер. Кол-во: {0}..."
+
+#~ msgid "GPS point"
+#~ msgstr "точка GPS"
+
+#~ msgid "reverter: {0}"
+#~ msgstr "откатчик: {0}"
 
 #~ msgid "No data imported."
@@ -33432,7 +33449,4 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Нажмите \"Обновить\" для обновления списка"
-
-#~ msgid "Revert"
-#~ msgstr "Откатить"
 
 #~ msgid "Tags (empty value deletes tag)"
@@ -35311,4 +35325,10 @@
 #~ msgstr "Использовать все чужие элементы"
 
+#~ msgid ""
+#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
+#~ msgstr ""
+#~ "Автоматический выбор первого слоя WMS во время захвата, если слоёв "
+#~ "несколько."
+
 #~ msgid "Dsdfasdfsdfotos"
 #~ msgstr "Dsdfasdfsdfotos"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 21299)
+++ applications/editors/josm/i18n/po/sk.po	(revision 21304)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
 "PO-Revision-Date: 2010-04-24 22:46+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:50+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Nápoveda"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Ignorujem poškodený súbor z URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "Upozornenie"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parameter \"downloadgps\" neakceptuje  názov súboru, alebo URL súboru"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -232,5 +232,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -249,5 +249,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -270,5 +270,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -282,4 +282,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -337,4 +338,13 @@
 msgstr "Pridať bod zadaním zemepisnej šírky a dĺžky."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -348,8 +358,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -405,5 +415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -459,5 +469,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -468,7 +478,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -486,7 +497,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -554,28 +565,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Nie je zvolené nič, čo by se mohlo priblížiť."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Priblížiť na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Priblížiť pohľad na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Zobrazenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť"
@@ -666,5 +677,5 @@
 msgstr "Spojiť {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Prosím, vyberte aspoň dve cesty pre spojenie."
@@ -714,5 +725,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -823,5 +834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Stiahnuť objekt"
@@ -866,5 +877,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -994,25 +1005,25 @@
 msgstr "Nenájdený žiadny priesečník. Nič nebolo zmenené."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "Pridať body na všetky priesečníky"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 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:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Oprava relácie"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Spojená prekrývajúca sa plocha"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Spojené prekrývajúce sa plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1022,33 +1033,33 @@
 "overte či to nepredstavuje nejakú chybu."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Zadajte hodnoty pre všetky konflikty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Riešenie konfliktov"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Oprava konfliktu (rozporu) značiek"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Odstránený Prvok z Relácií"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Spojiť plochy: Vymazať krátke cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Uzavretá cesta"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Vymazať značky z vnútorných ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Funkcie Spojenia Plôch (Join Areas Function)"
@@ -1067,5 +1078,5 @@
 msgstr "Spojiť body a línie"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Bez skratky"
@@ -1530,8 +1541,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1541,5 +1552,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1968,20 +1979,27 @@
 msgstr "Vrátiť poslednú akciu."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Odznačiť všetko"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Odznačiť všetky objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Odznačiť všetko (Focus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Odznačiť všetko (Escape)"
@@ -2103,16 +2121,12 @@
 msgstr "Prepnúť drôtový model"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Priblížiť"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Oddialiť"
@@ -2331,9 +2345,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2350,52 +2364,52 @@
 "nemaže body. CTRL: zmaže referenčné objekty."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Kresliť"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Kresliť body"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Režim: Kresliť Fokus"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 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:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Pridať bod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Pridať bod do cesty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Pripojiť existujúcu cestu do bodu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 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:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 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:936
 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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 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:943
 #, java-format
 msgid "Insert new node into way."
@@ -2405,14 +2419,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:953
 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:955
 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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Koniec kreslenia."
@@ -2974,5 +2988,5 @@
 msgstr "Pridať reláciu {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3900,5 +3914,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "zvolené"
@@ -3929,5 +3943,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "pozadie"
@@ -4013,9 +4027,9 @@
 msgstr "PUWG Zone"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (Poľsko)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4113,6 +4127,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4233,38 +4247,38 @@
 "Očakávaná nie prázdna hodnota pre parameter ''{0}'', dostal som ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Nahrať nastavenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Nahrať súčasné nastavenie na server"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "reťazec"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Meno užívateľa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM heslo."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Zmeniť veľkosť appletu (formát: ŠÍRKAxVÝŠKA)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "reťazec;reťazec;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4274,5 +4288,5 @@
 "šírka=y&dĺžka=x&zoom=z alebo ešte názov súboru"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4282,5 +4296,5 @@
 "obsahujúcom šírka=y&dĺžka=x&zoom=z alebo ešte  ešte názov súboru"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4290,89 +4304,89 @@
 "google, alebo URL vracajúci sa z osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "akýkoľvek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 "Ak je špecifikovaný(určený), reset konfigurácie namiesto jej načítania."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../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:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Heslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "použitie"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "Možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Zobrazí túto nápovedu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Štandardný unix geometry argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Stiahnuť ohraničujúcí box"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 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:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 "Otvoriť súbor (niektoré typy súborov môžu byť otvorené s Súbor/Otvoriť)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 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:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "Sťahovanie polohy na url (so lat=x&lon=y&zoom=z) ako raw gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Výber s určeným hľadaním"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Spustiť v maximalizovanom režime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Nastaviť východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "Nastaviť jazyk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "možnosti poskytnutia ako Java system properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/CESTA/K/JOSM/ZLOŽKE/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 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:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4386,9 +4400,9 @@
 "megabytes"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "príklady"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4398,37 +4412,37 @@
 "poriadku."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "Uistite sa, že ste načítali nejaké dáta ak ste použili --výber."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Prebieha inicializácia"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "Aktualizujem pluginy..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "Inštalujem aktualizované pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Načítavam skoršie pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Nastavujem východzie hodnoty"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Vytváram hlavné grafické rozhranie ( GUI )"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Načítavam pluginy"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4441,5 +4455,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4565,10 +4579,10 @@
 msgstr "Používateľ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "vrstva nie je v zozname"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -5016,5 +5030,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5277,5 +5291,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5283,7 +5297,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>Držať sa vašej lokálnej verzie, JOSM<br>má resetnúť id pôvodných {0} "
-"na 0.<br>Pri ďalšom nahrávaní serveru bude priraďovať <br>toto je nové id."
-"<br>Súhlasíte?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5535,6 +5546,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5546,5 +5557,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5851,5 +5862,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5924,5 +5935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Znovu načítať"
@@ -5978,9 +5989,9 @@
 msgstr "Duplikovať túto vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Presunúť zvolenú vrstvu o riadok hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Presunúť zvolenú vrstvu o riadok dole."
@@ -7126,8 +7137,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7793,55 +7804,55 @@
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 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/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 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/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr "Vybrať reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "Vybrať reláciu v hlavnom výbere."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr "Vybrať v obsahu relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr "Vybrať reláciu v obsahu relácií."
@@ -8513,5 +8524,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr "Hranice"
@@ -8543,21 +8554,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Chyba null pointera, možno sú neprítomné značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "Hľadám ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "Kliknutím sa spustí hľadanie pre miesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "Pýtam sa na meno servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "Pýtam sa na meno servera ..."
@@ -8579,5 +8590,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8591,5 +8602,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8625,14 +8636,14 @@
 msgstr "Čísla dlaždíc"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "Neúspešné načítanie CSS súboru ''help-browser.css''. Výnimka je: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM Help Browser"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8653,5 +8664,5 @@
 "\">táme pomoci v angličtine</a>.</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8964,5 +8975,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "Objavené konflikty"
@@ -9800,7 +9811,11 @@
 
 #: ../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/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Nahrávanie {0} objektov ..."
+msgstr[1] "Nahrávanie {0} objektu ..."
+msgstr[2] "Nahrávanie {0} objektov ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9975,4 +9990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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"
@@ -10148,5 +10164,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -10214,18 +10230,18 @@
 msgstr "Údajová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "mimo ukladanej oblasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 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:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -10235,5 +10251,5 @@
 msgstr[2] "Bolo tam zistených {0} konfliktov."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -10254,5 +10270,5 @@
 "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -10272,11 +10288,11 @@
 "List Dialog a manuálne ich vyriešte."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 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:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -10286,32 +10302,32 @@
 msgstr[2] "{0} vymazaných"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skladá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "neuršený (unset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "Verzia API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Previesť do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr "Test konzistencie dátovej sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr "Nezistený žiadny problém"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr "Bol najdený nasledujúci problém:"
@@ -10363,8 +10379,4 @@
 msgstr[1] "{0} body"
 msgstr[2] "{0} bodov"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr "GPS bod"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
@@ -10658,5 +10670,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS súradnicami"
@@ -10683,5 +10695,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "Vymazať súbor s obrázkom z disku"
@@ -10715,55 +10727,55 @@
 msgstr "Chyba v súbore {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr "Zobraziť obrázky s geotagmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../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:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "Zobraziť predchádzajúci obrázok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr "Geoobrázok: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Odstraniť fotku z vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr "Zmazať súbor z disku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../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:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "Zobraziť nasledujúci obrázok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Stredový pohľad"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Najvhodnejšie zväčšenie 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr "Presunúť dialóg na bočný panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10774,5 +10786,5 @@
 "Výška: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10846,7 +10858,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Zobraziť/Skryť Text/Ikony"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11764,35 +11775,35 @@
 msgstr "Kalibrácia zvukového nahrávania"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Farba"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Farebný štýl {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Vybrať"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Zvoľte farbu pre {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Zadať východzie (prednastavené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Zadať všetko východzie (prednastavené)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Farby použité rôznymi objektami v JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Farby"
@@ -12257,17 +12268,17 @@
 msgstr "JOSM Plugin description URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "vypnuté"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "bez modifikácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Klávesové skratky</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -12278,5 +12289,5 @@
 "prejavili.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -12291,5 +12302,5 @@
 "prečo <b>reštartovať</b> JOSM po vykonaní týchto zmien.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -12317,9 +12328,9 @@
 "Ctrl + Shift + a Ctrl +: je to vlastne to isté na klávesnici USA.</p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Skupiny modifikátorov</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -12335,5 +12346,5 @@
 "priraďovať klávesovú skratky náhodne. </p>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -12342,66 +12353,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Čítajte ako prvé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Použíť východzie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Vypnúť"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Kláves:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Upozornenie: Používajte iba skutočné klávesy!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Klávesové skratky"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Upraviť skratky"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Primárny modifikátor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Sekundárny modifikátor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Terciálny modifikátor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menu skratiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Hlavné skratky"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Podokno skratiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Skupiny modifikátorov"
@@ -12462,21 +12473,21 @@
 msgstr "Niektoré nastavenia sa prejavia až po reštartovaní JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Zobrazovať súradnice ako"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Metóda projekcie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "Kód projekcie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Projekcia mapy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -12521,10 +12532,9 @@
 msgstr "Zmena klávesových skratiek manuálne."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Akcia"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Skratka"
@@ -13049,24 +13059,23 @@
 msgstr "Neznány type (druh): {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba rozkladania(parsovania) {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, 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:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -13077,17 +13086,17 @@
 msgstr[2] "Zmeniť {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Nič nie je vybraté!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Nevhodný výber!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Použiť predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Zmeniť vlastnosti"
@@ -13633,12 +13642,4 @@
 msgid "Preparing upload request..."
 msgstr "Pripravujem požiadavku pre nahrávanie ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] "Nahrávanie {0} objektov ..."
-msgstr[1] "Nahrávanie {0} objektu ..."
-msgstr[2] "Nahrávanie {0} objektov ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -13982,7 +13983,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
-#, fuzzy
 msgid "Missing key or value attribute in tag."
-msgstr "Chýba povinná vlastnosť ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
@@ -14125,7 +14125,7 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
-#, fuzzy, java-format
+#, java-format
 msgid "Line {0} column {1}: "
-msgstr "(v rade {0}, stĺpec {1})"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
@@ -15089,5 +15089,5 @@
 msgstr "nepoužité"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -15100,5 +15100,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -15108,5 +15108,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -15117,5 +15117,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Pomoc: Skratky môžeš modifikovať v nastaveniach)"
@@ -15502,15 +15502,15 @@
 msgstr "Počet: (Numbers:)"
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr "Nemožno umiestniť budovy mimo Zeme."
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Vytvoriť budovu"
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -15529,18 +15529,18 @@
 msgstr "Dĺžka kroku:"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr "Kresliť budovy"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr "Bod na rohu budovy, na začiatok kreslenia"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr "Bod na opačnom konci budovy"
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr "Nastaviť šírku budov"
@@ -15724,7 +15724,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Vybrať WMS vrstvu"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -16277,7 +16276,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Penzión"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -16316,7 +16314,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Voliteľné"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16345,7 +16342,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Úbytok"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -17819,32 +17815,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Vrátiť naspäť"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "História objektu"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Položka priebehu"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Rozloženie OSM history data ..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Požiadavka zmenových súborov"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "požadovaný: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relácia ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Ukázať súbor zmien {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -18082,5 +18079,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -18158,11 +18154,11 @@
 msgstr "neočakávané číslo stĺpca {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tester predvolieb značenia"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -18171,5 +18167,5 @@
 "značenia."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "Najskôr určite zdroj predvoľby značenia v predvoľbách."
@@ -19099,57 +19095,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Zmazať objekty"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Zmazať objekty"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Vyberte ak dáta majú byť stiahnuté na novú vrstvu"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Vložiť ID objektu, ktorý má byť stiahnutý"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Zmazať objekty"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Zmazať objekty"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Žačať nastavovanie"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Zavrieť dialóg a zrušiť sťahovanie"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Súbor: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Nahrávam {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Bod {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19918,4 +19906,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Obchod s DVD"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -20355,4 +20353,10 @@
 msgstr "Musíte urobiť vaše zmeny verejnými pre nahratie nových dát"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "dole"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -20567,7 +20571,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Spustiť dialógové okno pre požiadavky zmenových súborov"
+msgstr ""
 
 #. Plugin routes
@@ -20631,11 +20634,8 @@
 #. Plugin turnrestrictions
 #: build/trans_plugins.java:81
-#, fuzzy
 msgid ""
 "The turnrestrictions plugin allows to enter maintain information about turn "
 "restrictions in the OpenStreetMap database."
 msgstr ""
-"Plugin zákaz odbočenia umožňuje vytvárať a upravovať obmedzenia v jazde v "
-"databáze OpenStreetMap."
 
 #. Plugin undelete
@@ -20654,6 +20654,14 @@
 "jednotný pre názvy značiek."
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -20664,5 +20672,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -20670,10 +20678,10 @@
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr "Vyberte poradie nerozvetvených spojených ciest"
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -20684,5 +20692,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -33159,9 +33167,9 @@
 msgstr "Sicily - Italy"
 
-#~ msgid ""
-#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
-#~ msgstr ""
-#~ "Automaticky vyberte najprv WMS vrstvu pre zachytávanie(grabing), ak "
-#~ "existuje viac vrstiev."
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Nahrávam {0} objekty(ov) ..."
+
+#~ msgid "GPS point"
+#~ msgstr "GPS bod"
 
 #~ msgid "Move"
@@ -33302,7 +33310,4 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Kľuknite na obnoviť pre aktualizáciu zoznamu"
-
-#~ msgid "Revert"
-#~ msgstr "Vrátiť naspäť"
 
 #~ msgid ""
@@ -35090,2 +35095,8 @@
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Zmazať staršie súbory pluginov {0}"
+
+#~ msgid ""
+#~ "Automaticly select first WMS layer when grabing if multiple layers exist."
+#~ msgstr ""
+#~ "Automaticky vyberte najprv WMS vrstvu pre zachytávanie(grabing), ak "
+#~ "existuje viac vrstiev."
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 21299)
+++ applications/editors/josm/i18n/po/sl.po	(revision 21304)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-04-24 23:22+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 09:32+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,9 +17,9 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:54+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:30+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -32,12 +32,12 @@
 msgstr "Pomoč"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -97,9 +97,9 @@
 msgstr "Pozor"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -226,5 +226,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -264,5 +264,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -276,4 +276,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -329,4 +330,13 @@
 msgstr "Dodaj vozlišče z vpisom zemljepisne širine in dolžine"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -340,8 +350,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -397,5 +407,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -451,5 +461,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -460,7 +470,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -478,7 +489,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -546,28 +557,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Povečava na {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Povečava pogleda na {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Pogled: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr ""
@@ -656,5 +667,5 @@
 msgstr "Združi {0} poti"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr ""
@@ -702,5 +713,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -811,5 +822,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr ""
@@ -854,5 +865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -981,25 +992,25 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1007,33 +1018,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Razreši neskladja"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr ""
@@ -1052,5 +1063,5 @@
 msgstr "Priključi vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr ""
@@ -1490,8 +1501,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1501,5 +1512,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1904,20 +1915,27 @@
 msgstr "Izniči zadnje dejanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Počisti izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Odizberi vse predmete"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr ""
@@ -2036,16 +2054,12 @@
 msgstr ""
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Povečaj"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zmanjšaj"
@@ -2255,9 +2269,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2272,52 +2286,52 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Nariši"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Nariši vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Ni mogoče dodati vozlišča izven tega sveta."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Dodaj vozlišče"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Dodaj vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Poveži obstoječo pot z vozliščem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Dodaj novo vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Dodaj in poveži vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Ustvari novo vozlišče."
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Izberi vozlišče pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2328,14 +2342,14 @@
 msgstr[3] "Vstavi novo vozlišče v {0} poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Začni novo pot od zadnjega vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Nadaljuj pot od zadnjega vozlišča."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Zaključi risanje."
@@ -2854,5 +2868,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3723,5 +3737,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "izbrano"
@@ -3752,5 +3766,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "ozadje"
@@ -3834,9 +3848,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3934,6 +3948,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4055,38 +4069,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Pošiljanje nastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Prenos trenutnih nastavitev na strežnik"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Ime uporabnika."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "Geslo za dostop do OSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4094,5 +4108,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4100,5 +4114,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4106,87 +4120,87 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "katerikoli"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Geslo"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "uporaba"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "možnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Prikaži to pomoč"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Sprejmi pravokotno področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Sprejmi pravokotno področje GPS podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Ponastavi nastavitve na privzete"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4196,9 +4210,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "primeri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4206,37 +4220,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Pripravljanje"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Nalaganje zgodnjih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Privzete nastavitve"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Priprava grafičnega uporabniškega vmesnika"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Nalaganje vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4249,5 +4263,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4371,10 +4385,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "plasti ni na seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4787,5 +4801,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5273,6 +5287,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5283,5 +5297,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5557,5 +5571,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5630,5 +5644,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Ponovno naloži"
@@ -5684,9 +5698,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Pomakni izbrano plast vrstico višje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Pomakni izbrano plast vrstico nižje."
@@ -6812,8 +6826,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7435,55 +7449,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+msgid "Delete from relation"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naj res izbrišem izbor iz relacije {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8111,5 +8125,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8141,21 +8155,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8177,5 +8191,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8189,5 +8203,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8223,14 +8237,14 @@
 msgstr "Številke ploščic"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8244,5 +8258,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8530,5 +8544,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9264,7 +9278,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9421,4 +9438,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
 msgid "gps point"
 msgstr "točka GPS"
@@ -9585,5 +9603,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9647,18 +9665,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "izven sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9667,5 +9685,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9679,5 +9697,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9690,11 +9708,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9703,32 +9721,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} je sestavljen iz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Pretvori v plast GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9780,8 +9798,4 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10056,5 +10070,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Slike z geografskim položajem"
@@ -10079,5 +10093,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10109,55 +10123,55 @@
 msgstr "Napaka v datoteki {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Odstrani fotografijo iz plasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10166,5 +10180,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10229,7 +10243,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Prikaži/skrij besedilo/ikone"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11037,35 +11050,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Barva"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Izberite"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Izberite barvo za {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "Barve različnih predmetov v JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Barve"
@@ -11510,17 +11523,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11528,5 +11541,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11537,5 +11550,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11552,9 +11565,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11565,5 +11578,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11572,66 +11585,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Tipka:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Pozor: Uporabite le dejanske tipke!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Tipke za bližnjice"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr ""
@@ -11692,21 +11705,21 @@
 msgstr "Za upoštevanje nekaterih sprememb je potrebno ponovno zagnati JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Oblika prikaza koordinat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Geografska projekcija"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11751,10 +11764,9 @@
 msgstr ""
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr ""
@@ -12228,24 +12240,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12257,17 +12268,17 @@
 msgstr[3] "Spremeni {0} predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Uporabi prednastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Spremeni lastnosti"
@@ -12778,11 +12789,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14060,5 +14064,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14068,5 +14072,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14074,5 +14078,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14081,5 +14085,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Namig: Bližnjice lahko urejate v nastavitvah.)"
@@ -14449,15 +14453,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14476,18 +14480,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -15212,7 +15216,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "možnosti"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -16674,31 +16677,34 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #, fuzzy
-msgid "Objects history"
-msgstr "Novi predmeti:"
+msgid "Revert"
+msgstr "Reka"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "History reverter"
-msgstr "Zgodovina elementa"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Priprava podatkov OSM..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-msgid "Revert changeset"
-msgstr ""
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "Napaka: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Pripravljanje..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Zadnja sprememba {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -16934,5 +16940,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17009,16 +17014,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Preizkus prednastavljenih oznak"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -17864,12 +17869,10 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Odizberi vse predmete"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Odizberi vse predmete"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
@@ -17878,17 +17881,14 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Ime predmeta pod kazalcem miške."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Odizberi vse predmete"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Odizberi vse predmete"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
@@ -17901,17 +17901,17 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Datoteka: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Povečava na {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "Najdeno {0} zadetkov"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18656,4 +18656,14 @@
 msgstr ""
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Pogled"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19062,4 +19072,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "dol"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19316,6 +19332,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19324,15 +19348,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19341,5 +19365,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32025,7 +32049,4 @@
 #~ msgstr "Uskladite čas z GPS napravo"
 
-#~ msgid "Preparing..."
-#~ msgstr "Pripravljanje..."
-
 #~ msgid "Uploading..."
 #~ msgstr "Pošiljanje ..."
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 21299)
+++ applications/editors/josm/i18n/po/sv.po	(revision 21304)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-09 21:12+0000\n"
-"Last-Translator: Martin Öberg <Unknown>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 10:27+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,9 +16,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:49+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:31+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -31,12 +31,12 @@
 msgstr "Hjälp"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "Hoppar över felaktig URL till en fil: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -75,5 +75,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -96,9 +96,9 @@
 msgstr "Varning"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "Parametern \"downloadgps\" godtar inte filnamn eller fil URL:er."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -118,8 +118,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -231,5 +231,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -248,5 +248,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -269,5 +269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -281,4 +281,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -336,4 +337,13 @@
 msgstr "Lägg till en nod genom att ange latitud och longitud."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -347,8 +357,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -404,5 +414,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -458,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -467,7 +477,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -485,7 +496,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -553,28 +564,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Det finns inte något valt att zooma till"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "Zooma till {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Zooma det visade till  {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Visa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Det finns inte några konflikter att zooma till"
@@ -667,5 +678,5 @@
 msgstr "Slå ihop {0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Välj åtminstone två sträckor att slå ihop"
@@ -715,5 +726,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -824,5 +835,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Ladda ner objekt"
@@ -868,5 +879,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -995,25 +1006,25 @@
 msgstr "Inget överlapp funnet. Ingenting har ändrats."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "La till nod vid alla korsande sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "Ta bort sträckor som inte är del av en inre multipolygon"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "Korrigera relationer"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Slog ihop område som låg ovanpå sig själv"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Slog ihop områden som låg ovanpå varandra"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1023,33 +1034,33 @@
 "att det inte har uppstått några fel."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Ange värden för alla konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Jämka konflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Korrigera taggkonflikter"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "Tog bort element från relation"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Slå ihop områden: Ta bort korta sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Sluten sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "Ta bort taggar från inre sträckor"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Ytsammanslagningsfunktion"
@@ -1068,5 +1079,5 @@
 msgstr "Förena nod och linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Inget kortkommando"
@@ -1522,8 +1533,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1533,5 +1544,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1953,20 +1964,27 @@
 msgstr "Ångra senaste åtgärden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Avmarkera alla"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Avmarkera alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Avmarkera allt (fokus)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Avmarkera allt (Escape)"
@@ -2085,16 +2103,12 @@
 msgstr "Växla trådnätsvisning"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zooma ut"
@@ -2311,9 +2325,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2330,52 +2344,52 @@
 "noder vid borttagning av sträcka. Ctrl: ta bort objekt som refererar hit"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Rita"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Rita noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Det går inte att lägga till en nod utanför världen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Lägg till nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Lägg till en nod till sträckan"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Knyt en existerande nod till en sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Lägg till en ny nod i en befintlig sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Lägg till en nod i en sträcka och bind ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "Skapa ny nod"
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "Markera nod under pekare."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2384,14 +2398,14 @@
 msgstr[1] "Infoga ny nod i {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "Starta ny väg från senaste nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "Fortsätt väg från senaste nod."
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "Avsluta ritning."
@@ -2951,5 +2965,5 @@
 msgstr "Lägg till relation {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3821,5 +3835,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "markerad"
@@ -3850,5 +3864,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "bakgrund"
@@ -3932,9 +3946,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -4032,6 +4046,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4149,38 +4163,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Skicka in inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Skicka in inställningar till servern"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "sträng"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Användarnamn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM-lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "Ändra storleken på appleten till angiven geometri (format: BREDDxHÖJD)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4190,5 +4204,5 @@
 "lat=y&lon=x&zoom=z eller ett filnamn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4198,5 +4212,5 @@
 "lat=y&lon=x&zoom=z eller ett filnamn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4206,87 +4220,87 @@
 "eller en URL som returnerar osm-xml"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "valfri"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Om angivet så återställ konfigurationen istället för att läsa in den."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "Användarnamn"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "användning"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "alternativ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Visa denna hjälptext"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standard unix-geometri-argument"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Hämta hem området inom gränsvärdena"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Hämta platsen som anges i url:en (med lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Hämta området innanför gränsvärden som rå gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Gör urval med angivet sökkriterium"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "Öppna i maximerat läge"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Återställ inställningarna till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4296,9 +4310,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "exempel"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4306,37 +4320,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Initierar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Hämtar tidiga insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Anger förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Skapar huvudgränssnittet"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Hämtar insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4349,5 +4363,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4471,10 +4485,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "lagret finns inte i listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4887,5 +4901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5373,6 +5387,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5383,5 +5397,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5658,5 +5672,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5731,5 +5745,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Uppdatera"
@@ -5785,9 +5799,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Flytta det valda lagret en rad upp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Flytta det valda lagret en rad ner."
@@ -6915,8 +6929,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7534,55 +7548,55 @@
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Verkligen ta bort det valda från relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Ta bort den valda nyckeln från alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8211,5 +8225,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8241,21 +8255,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8277,5 +8291,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8289,5 +8303,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8323,14 +8337,14 @@
 msgstr "Rutnummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8344,5 +8358,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8630,5 +8644,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9369,7 +9383,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9526,4 +9543,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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-punkt"
@@ -9692,5 +9710,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9758,18 +9776,18 @@
 msgstr "Datalager {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "utanför hämtat område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9778,5 +9796,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9790,5 +9808,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9801,11 +9819,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9814,32 +9832,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Omvandla till gpx-lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9885,8 +9903,4 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10171,5 +10185,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotaggade bilder"
@@ -10194,5 +10208,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10224,55 +10238,55 @@
 msgstr "Fel i fil {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Föregående"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Ta bort foto från lagret"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Nästa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Centrera visning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10283,5 +10297,5 @@
 "Höjd: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10350,7 +10364,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Visa/Dölj text/ikoner"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11174,35 +11187,35 @@
 msgstr "Kalibrering av röstinspelare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Ritstil{0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Välj"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "Välj en färg för {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "Sätt till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "Sätt allt till förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "De färger som används av olika objekt i JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Färger"
@@ -11660,17 +11673,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "avaktiverad"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "ingen modifierare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Kortkommandon</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11678,5 +11691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11687,5 +11700,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11702,9 +11715,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Modifierargrupper</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11715,5 +11728,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11724,66 +11737,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "Läs först"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Använd förval"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Avaktivera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Tangent:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Varning: Använd endast riktiga tangenter!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "Kortkommandon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "Redigera kortkommandon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Förstahandsmodifierare:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "Andrahandsmodifierare:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Tredjehandsmodifierare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Kortkommandon i menyn"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Snabbtangenter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "Kortkommandon för underfönster"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Modifierargrupper"
@@ -11846,21 +11859,21 @@
 "Du behöver starta om JOSM för att vissa inställningar skall slå igenom."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "Visa koordinater som"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projektionsmetod"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Kartprojektion"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11905,10 +11918,9 @@
 msgstr "Ändra kortkommandon manuellt."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Åtgärd"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Kortkommando"
@@ -12382,24 +12394,23 @@
 msgstr "Okänd typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fel vid tolkning {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Objekt av typ {0} stöds."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12409,17 +12420,17 @@
 msgstr[1] "Ändra {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "Inget markerat!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "Urvalet passar inte!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "Tillämpa snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Ändra egenskaper"
@@ -12930,11 +12941,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14218,5 +14222,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14230,5 +14234,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14238,5 +14242,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14247,5 +14251,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(Tips: Du kan själv välja kortkommandon i inställningarna.)"
@@ -14615,15 +14619,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14642,18 +14646,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14820,7 +14824,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Välj ett mål lager."
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15350,7 +15353,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Pensionat"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15386,7 +15388,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "Valfri"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15413,7 +15414,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "Mätningar"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16874,32 +16874,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Återgå"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Objektshistorik"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Objektshistorik"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Förbereder OSM-data..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "Avsluta påbörjade  changesets"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "begärd: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "Relation ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Senast ändrad {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17137,5 +17138,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17212,11 +17212,11 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Uttestare av snabbval för taggning"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
@@ -17225,5 +17225,5 @@
 "taggning."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
@@ -18070,57 +18070,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Avmarkera alla objekt."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Avmarkera alla objekt."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "Välj om datan ska hämtas som ett nytt lager"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Mata in ID:et på det objekt som ska laddas hem"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Avmarkera alla objekt."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Avmarkera alla objekt."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "Starta nerladdning"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Stäng dialogen och avbryt hämtning"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Arkiv: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Hämtar {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "{0} sökträffar"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18889,4 +18881,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Videobutik"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19298,4 +19300,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "ned"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19483,7 +19491,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "Avsluta påbörjade  changesets"
+msgstr ""
 
 #. Plugin routes
@@ -19557,6 +19564,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19565,15 +19580,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19582,5 +19597,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -32147,7 +32162,4 @@
 #~ msgstr "Jämkar konflikter"
 
-#~ msgid "Revert"
-#~ msgstr "Återgå"
-
 #~ msgid "Delete the selected layer."
 #~ msgstr "Ta bort valt lager."
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 21299)
+++ applications/editors/josm/i18n/po/tr.po	(revision 21304)
@@ -10,7 +10,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-07 11:54+0000\n"
-"Last-Translator: Yiğit Ateş <yigitates52@gmail.com>\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-15 19:28+0000\n"
+"Last-Translator: Angel Spy <melissadilara@yahoo.com>\n"
 "Language-Team: Türkçe\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,9 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:53+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -33,12 +33,12 @@
 msgstr "Yardım"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "hatalı dosya atlandı URL: \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -77,5 +77,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -98,5 +98,5 @@
 msgstr "Uyarı"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
@@ -104,5 +104,5 @@
 "etmemektedir."
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -122,8 +122,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -229,5 +229,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -267,5 +267,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -279,4 +279,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -332,4 +333,13 @@
 msgstr "Enlem ve Boylam girerek nokta ekle."
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -343,8 +353,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -400,5 +410,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -454,5 +464,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -463,7 +473,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -481,7 +492,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -549,28 +560,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "Yakınlaştıracak bir şey yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "{0} kadar yakınlaştır"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "Görünüm {0} kadar yakınlaştır {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "Görüntü: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "Yakınlaştıracak bir çakışma yok."
@@ -661,5 +672,5 @@
 msgstr "{0} yol birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "Lütfen birleştirmek için en az iki yol seçiniz."
@@ -709,5 +720,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -818,5 +829,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "Nesneyi indir"
@@ -861,5 +872,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -988,25 +999,25 @@
 msgstr "Kesişme bulunamadı. Hiçbir şey değiştirilmedi."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "İlişkileri düzelt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "Otomatik olarak üstüste gelen alanlar birleştirildi"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "Üstüste gelen alanlar birleştirildi"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1014,33 +1025,33 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "Bütün çakışmaları için yeni değerler gir."
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "Çakışmaları Çöz"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "Etiket çakışmalarını düzelt"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "Birleşme Alanları: Kısayolları Kaldır"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "Kapatılmış Yol"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "Birleşme Alanları Fonksiyonu"
@@ -1059,5 +1070,5 @@
 msgstr "Nokta ile çizgi birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "Kısayol Yok"
@@ -1496,8 +1507,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1507,5 +1518,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1907,20 +1918,27 @@
 msgstr "Son komutu geri al."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "Seçimleri Kaldır"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "Objelerdeki seçimi kaldır."
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "Seçimleri Kaldır (Odak)"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "Seçimleri Kaldır (Kaçış)"
@@ -2039,16 +2057,12 @@
 msgstr "Tel Göünümünü İşaretle"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "İçeri Yakınlaştır"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "Zoom Out"
@@ -2257,9 +2271,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2276,52 +2290,52 @@
 "kavşakları silmebir yol silerken. Ctrl:referans objelerini sil"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "Çiz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "Kavşakları Çiz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "Mode: Odağı Çiz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "Dünya dışına bir kavşak ekleyemezsiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "Kavşak Ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "Yola kavşak ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "Varolan yolu kavşağa ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "Varolan yola kavaşka ekle"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "Yola kavşak ekle ve birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
+msgid "Select node under cursor."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
-msgid "Select node under cursor."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
 #, java-format
 msgid "Insert new node into way."
@@ -2330,14 +2344,14 @@
 msgstr[1] ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
+msgid "Start new way from last node."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
-msgid "Start new way from last node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr ""
@@ -2864,5 +2878,5 @@
 msgstr "İlişki ekle {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3728,5 +3742,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "seçilmiş"
@@ -3757,5 +3771,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "arkaplan"
@@ -3839,9 +3853,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3939,6 +3953,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4054,28 +4068,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "Tercihleri yükleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "Tercihleri server'a yükleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "metin"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "Kullanıcının Adı."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM Şifresi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr ""
@@ -4083,11 +4097,11 @@
 "GENIŞLIKxYUKSEKLIK)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "metin;metin;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4096,5 +4110,5 @@
 "Hepsini indir x1,y1,x2,y2 içeren linkler lat=y&lon=x&zoom=z veya dosyaadı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4104,5 +4118,5 @@
 "veya dosyaadı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4112,87 +4126,87 @@
 "bir link olabilir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "herhangi"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "Belirlenmişse, konfigürsayonu sıfırla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "KullanıcıAdı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "şifre"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "kullanım"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "seçenekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "Bu Yardımı Göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "Standart unix geometry argümanı"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "Kutu ile belirlenen sınırları indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "Linkteki bilgiyi indir (lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "Kutu ile belirlenen alanı ham gps olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "Yapılan aramaya göre seçim yap"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "Tercihleri varsayılan değerlere getir"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4202,9 +4216,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "örnekler"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4212,37 +4226,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "Ayarlar Okunuyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "Eski eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "Varsayılan ayarlar alınıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "Arayüz Oluşturuluyor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "Eklentiler yükleniyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4255,5 +4269,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4377,10 +4391,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "tabaka listede yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4793,5 +4807,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -4799,5 +4813,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:154
 msgid "Remove"
-msgstr "Çıkart"
+msgstr "Kaldır"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:762
@@ -5279,6 +5293,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5288,5 +5302,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5561,5 +5575,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5634,5 +5648,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "Yenile"
@@ -5688,9 +5702,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "Seçili tabakayı bir satır yukarı taşı."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "Seçili tabakayı bir satır aşağı taşı."
@@ -6816,8 +6830,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7433,55 +7447,55 @@
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Özellik: {0} / Üyelik: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "Özellik / Üyelik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "İlişkiyi değiştir"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+msgid "Delete from relation"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
-msgid "Delete from relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "Seçili anahtarı her objeden sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "Seçili anahtarın değerini her obje için düzenle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
-msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8107,5 +8121,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8137,21 +8151,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr ""
@@ -8173,5 +8187,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8185,5 +8199,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8219,14 +8233,14 @@
 msgstr "Pafta Numarası"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8240,5 +8254,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8526,5 +8540,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr ""
@@ -9260,7 +9274,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr ""
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9417,4 +9434,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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 noktası"
@@ -9581,5 +9599,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9644,18 +9662,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "indirilen alanın dışında"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9664,5 +9682,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9676,5 +9694,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9687,11 +9705,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9700,32 +9718,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} şunları içerir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "GPX tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9767,8 +9785,4 @@
 msgstr[0] "{0} nokta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10052,5 +10066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "Geotagged Görüntüler"
@@ -10075,5 +10089,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr ""
@@ -10105,55 +10119,55 @@
 msgstr "Dosyada Hata {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "Önceki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "Fotoğrafı tabakadan kaldır"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "Sonraki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "Merkezi görünüm"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "Görüntüyü Ekrana oturt 1:1"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10164,5 +10178,5 @@
 "Yükseklik: {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10227,7 +10241,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "Göster/Sakla Metin/İkon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11042,35 +11055,35 @@
 msgstr "Ses kayıt cihazı kalibrasyonu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "Renk"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "Boya Stili {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "Seç"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "{0} için bir renk seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "JOSM da farklı objlerin kullandığı renkler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "Renkler"
@@ -11515,17 +11528,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "seçilemez"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "Belirteç yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">Klavye Kısayolları</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11533,5 +11546,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11542,5 +11555,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11557,9 +11570,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>Düzenleyici Grupları</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11570,5 +11583,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11579,66 +11592,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "İlk Okuncaktır"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "Varsayılanı Kullan"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "Etkisiz Kıl"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "Anahtar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "Dikkat: Gerçek Klavye tuşları kullanının!"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "klavye kısayolları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "kısayolları düzenle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "Asıl Düzenleyiciler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "İkincil Düzenleyiciler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "Üçüncül Düzenleyiciler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "Menu Kısayolları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "Klavye Kısayolları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "AltPancere Kısayolları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "Düzenleyici Grupları"
@@ -11699,21 +11712,21 @@
 msgstr "Ayarların aktif olamsı için programı açıp/kapatmalısınız."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "koordinatları şu şekilde göster"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "Projeksiyon türü"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "Harita Projeksiyonu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11758,10 +11771,9 @@
 msgstr "Klavye kısayollarını elle değiştir."
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "Aksiyon"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "Kısayol"
@@ -12235,24 +12247,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "Etiketteki özellikler okunamadı: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "İşleme Hatası {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12261,17 +12272,17 @@
 msgstr[0] "{0} Objeyi Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "Özellikleri Değiştir"
@@ -12782,11 +12793,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14063,5 +14067,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14074,5 +14078,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14082,5 +14086,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14091,5 +14095,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "(İpucu: Kısayolları Tercihler Penceresinden Değiştirebilirisiniz.)"
@@ -14459,15 +14463,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14486,18 +14490,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14664,7 +14668,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "Hedef katmanı seçin"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15188,7 +15191,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
-#, fuzzy
 msgid "I use the mouse"
-msgstr "Misafir Evi"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
@@ -15224,7 +15226,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "seçenekler"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15251,7 +15252,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "ölçümler"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16702,31 +16702,33 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+msgid "Revert"
+msgstr "Değiştir"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "Objects history"
-msgstr "Nesne geçmişi"
-
-#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
-#, fuzzy
-msgid "History reverter"
-msgstr "Elemanın Geçmişi"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "Hazırlanıyor..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-msgid "Revert changeset"
-msgstr ""
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "istendi: {0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "İlişki ..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "Son değişiklik: {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -16962,5 +16964,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17037,16 +17038,16 @@
 msgstr ""
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "Tagging Preset Tester"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr "Etiketleme test aracını açar."
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "İlk olaraklar tercihlerden etiket kaynağını seçmelisiniz."
@@ -17892,12 +17893,10 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "Objelerdeki seçimi kaldır."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "Objelerdeki seçimi kaldır."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
@@ -17906,42 +17905,37 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "Verinin indirileceği URL'yi girin:"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "Objelerdeki seçimi kaldır."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "Objelerdeki seçimi kaldır."
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "İndirmeyi başlat"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "Pencereyi kapat ve indirmeyi iptal et"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "Dosya: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "Yükleniyor {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "{0} Eşleşme bulundu"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18033,9 +18027,9 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
 msgid "Other"
-msgstr "Diğerler"
+msgstr "Diğerleri"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
 msgid "validation other"
-msgstr "Diğerlerini Onayla"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:102
@@ -18696,4 +18690,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Görünüm"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19108,4 +19112,10 @@
 msgstr ""
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "aşağı"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19362,6 +19372,14 @@
 msgstr ""
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19370,15 +19388,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19387,5 +19405,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -31969,7 +31987,4 @@
 #~ msgstr "Tazelemek için Yenile düğmesine basınız"
 
-#~ msgid "Revert"
-#~ msgstr "Değiştir"
-
 #~ msgid ""
 #~ "Revert the state of all currently selected objects to the version "
Index: applications/editors/josm/i18n/po/uk.po
===================================================================
--- applications/editors/josm/i18n/po/uk.po	(revision 21304)
+++ applications/editors/josm/i18n/po/uk.po	(revision 21304)
@@ -0,0 +1,33104 @@
+# Ukrainian translation for josm
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the josm package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: josm\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-14 06:16+0000\n"
+"Last-Translator: andygol <Unknown>\n"
+"Language-Team: Ukrainian <uk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:35+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. FIXME why is help not a JosmAction?
+#: ../core/src/org/openstreetmap/josm/Main.java:212
+#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:172
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:317
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:209
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:47
+msgid "Help"
+msgstr "Довідка"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:437
+#, java-format
+msgid "Ignoring malformed file URL: \"{0}\""
+msgstr "Ігнорування невірної адреси файлу: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
+#: ../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:68
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:171
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:119
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:149
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:128
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:147
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:159
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:170
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:185
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:282
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:288
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:461
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:467
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:154
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:186
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:638
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1032
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:188
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:270
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:490
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:513
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:161
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:121
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:296
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:538
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:143
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:68
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:143
+msgid "Warning"
+msgstr "Попередження"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:470
+msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
+msgstr "Параметр \"downloadgps\" не приймає імена файлів або URL-адреси файлів"
+
+#: ../core/src/org/openstreetmap/josm/Main.java:538
+#, java-format
+msgid "Ignoring malformed URL: \"{0}\""
+msgstr "Ігнорування невірної адреси: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
+msgid "About"
+msgstr "Про програму..."
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
+msgid "Display the about screen."
+msgstr "Показати інформацію про програму."
+
+#. TODO: put in a platformHook for system that have no console by default
+#. Add the name of this application
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:60
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
+msgid "Java OpenStreetMap Editor"
+msgstr "Редактор OpenStreetMap на Java"
+
+#. Add the version number
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:64
+#: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:70
+#, java-format
+msgid "Version {0}"
+msgstr "Версія {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:66
+#, java-format
+msgid "Last change at {0}"
+msgstr "Останні зміни: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:68
+#, java-format
+msgid "Java Version {0}"
+msgstr "Версія Java {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:70
+msgid "Homepage"
+msgstr "Домівка"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:72
+msgid "Bug Reports"
+msgstr "Звіти про помилки"
+
+#. <button label="Camping" hotkey="Z" icon="styles/standard/accommodation/camping/caravan.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Camping"/>
+#. </button>
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:78
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:26
+#: build/trans_surveyor.java:64
+msgid "Info"
+msgstr "Відомості"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:79
+msgid "Readme"
+msgstr "Для читання"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:80
+msgid "Revision"
+msgstr "Редакція"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:81
+msgid "Contribution"
+msgstr "Вклад до розвитку"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:82
+msgid "License"
+msgstr "Ліцензія"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:83
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:171
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:53
+msgid "Plugins"
+msgstr "Втулки"
+
+#: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:87
+msgid "About JOSM..."
+msgstr "Про JOSM…"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44
+#, java-format
+msgid ""
+"WARNING: unexpected format of API base URL. Redirection to info or history "
+"page for OSM primitive will probably fail. API base URL is: ''{0}''"
+msgstr ""
+"ПОПЕРЕДЖЕННЯ: неочікуваний формат базової адреси API. Перенаправлення на "
+"сторінку з інформацією або з історією OSM-елементів не можливо. Базова "
+"адреса API: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
+#, java-format
+msgid ""
+"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
+"user will probably fail. API base URL is: ''{0}''"
+msgstr ""
+"ПОПЕРЕДЖЕННЯ: неочікуваний формат базової адреси API. Перенаправлення на "
+"персональну сторінку користувача OSM не можливо. Базова адреса API: \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
+#, java-format
+msgid ""
+"You are about to launch {0} browser windows.<br>This may both clutter your "
+"screen with browser windows<br>and take some time to finish."
+msgstr ""
+"Ви збираєтесь відкрити {0} вікон оглядача.<br>Це може призвести до "
+"перевантаження вашого екрану вікнами<br>та зайняти певний час до закінчення "
+"операції."
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:123
+msgid "Continue"
+msgstr "Далі"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
+#, java-format
+msgid "Click to continue and to open {0} browsers"
+msgstr "Натисніть, щоб продовжити та відкрити {0} оглядачів"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:286
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:117
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:219
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:52
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:48
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:363
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:345
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:376
+#: ../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:406
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:342
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:330
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:300
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:151
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:740
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
+msgid "Click to abort launching external browsers"
+msgstr "Натисніть, щоб скасувати запуск зовнішніх оглядачів"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
+msgid "Please select at least one already uploaded node, way, or relation."
+msgstr ""
+"Будь ласка, виберіть принаймні одну вже надіслану на сервер точку, лінію або "
+"зв'язок."
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:62
+msgid "Please select the target layer."
+msgstr "Будь ласка, оберіть шар."
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:66
+msgid "Select target layer"
+msgstr "Виберіть шар"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
+msgid "Merge"
+msgstr "Об'єднати"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:80
+#, java-format
+msgid ""
+"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
+"</html>"
+msgstr ""
+"<html>Шари, з якими можна об’єднати первісний шар<br>''{0}''<br>відсутні.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
+msgid "No target layers"
+msgstr "Шар не обрано"
+
+#. 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:163
+msgid "Add Node..."
+msgstr "Додати точку…"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:56
+msgid "Add a node by entering latitude and longitude."
+msgstr "Додати точку, зазначивши її широту та довготу."
+
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
+#, java-format
+msgid "Edit: {0}"
+msgstr "Правити: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:101
+msgid "Enter the coordinates for the new node."
+msgstr "Введіть координати нової точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:102
+msgid "Use decimal degrees."
+msgstr "Використовувати десяткові градуси"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:103
+msgid "Negative values denote Western/Southern hemisphere."
+msgstr "Від'ємні значення вказують на Західну/Південну півкулі"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:85
+#: ../plugins/grid/src/grid/GridLayer.java:193
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
+msgid "Latitude"
+msgstr "Широта"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:88
+#: ../plugins/grid/src/grid/GridLayer.java:195
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
+msgid "Longitude"
+msgstr "Довгота"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:223
+msgid "Please enter a valid latitude in the range -90..90"
+msgstr "Будь ласка, введіть правильну широту в діапазоні -90..90"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:226
+msgid "Please enter a latitude in the range -90..90"
+msgstr "Введіть широту в діапазоні -90..90"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:234
+msgid "Please enter a valid longitude in the range -180..180"
+msgstr "Будь ласка, введіть правильну довготу в діапазоні -180..180"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:237
+msgid "Please enter a longitude in the range -180..180"
+msgstr "Введіть довготу в діапазоні -180..180"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:273
+#: ../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:350
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:192
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:37
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:33
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:299
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:145
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:301
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:686
+msgid "OK"
+msgstr "Так"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274
+msgid "Close the dialog and create a new node"
+msgstr "Закрити діалог і створити нову точку"
+
+#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
+msgid "Close the dialog, do not create a new node"
+msgstr "Закрити діалог, не створюючи нову точку"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:256
+msgid "Align Nodes in Circle"
+msgstr "Вирівняти точки по колу"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37
+msgid "Move the selected nodes into a circle."
+msgstr "Змістити вибрані точки так, щоб вони утворили коло"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+#: ../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:114
+#: ../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:55
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:66
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
+#, java-format
+msgid "Tool: {0}"
+msgstr "Інструмент: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:139
+msgid "Please select at least four nodes."
+msgstr "Будь ласка, виберіть щонайменше чотири точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:46
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:95
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:900
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:929
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:694
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
+msgid "Information"
+msgstr "Інформація"
+
+#. Do it!
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:133
+msgid "Align Nodes in Line"
+msgstr "Вирівняти точки в одну лінію"
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:33
+msgid "Move the selected nodes in to a line."
+msgstr "Змістити вибрані точки в одну лінію."
+
+#: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:65
+msgid "Please select at least three nodes."
+msgstr "Будь ласка, виберіть щонайменше три точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32
+msgid "data"
+msgstr "дані"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:33
+msgid "layer"
+msgstr "шар"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:34
+msgid "selection"
+msgstr "виділення"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
+msgid "conflict"
+msgstr "конфлікт"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:36
+msgid "download"
+msgstr "завантажити"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
+msgid "previous"
+msgstr "попередній"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
+msgid "next"
+msgstr "наступний"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
+msgid "Nothing selected to zoom to."
+msgstr "Нічого не виділено для показу"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
+#, java-format
+msgid "Zoom to {0}"
+msgstr "Масштабувати до {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#, java-format
+msgid "Zoom the view to {0}."
+msgstr "Масштабувати вид до {0}."
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
+#, java-format
+msgid "View: {0}"
+msgstr "Вид: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
+msgid "No conflicts to zoom to"
+msgstr "Немає конфліктів для показу"
+
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
+msgid "Changeset Manager"
+msgstr "Менеджер наборів змін"
+
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:37
+msgid "Toggle visibility of Changeset Manager window"
+msgstr "Показати/приховати вікно менеджера наборів змін"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:384
+msgid "Close open changesets"
+msgstr "Закрити відкриті набори змін"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
+msgid "Closes open changesets"
+msgstr "Закриває відкриті набори змін"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:48
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
+#: ../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:89
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
+#, java-format
+msgid "File: {0}"
+msgstr "Файл: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
+msgid "There are no open changesets"
+msgstr "Відкриті набори змін відсутні"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
+msgid "No open changesets"
+msgstr "Відкриті набори змін відсутні"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
+msgid "Downloading open changesets ..."
+msgstr "Завантаження відкритих наборів змін…"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:50
+msgid "Combine Way"
+msgstr "Приєднати лінію"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
+msgid "Combine several ways into one."
+msgstr "З'єднати кілька ліній в одну."
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:56
+msgid "Change directions?"
+msgstr "Змінити напрямки?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:57
+msgid "Reverse and Combine"
+msgstr "Змінити напрямок на протилежний і з'єднати"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
+msgid ""
+"The ways can not be combined in their current directions.  Do you want to "
+"reverse some of them?"
+msgstr ""
+"Лінії з їх поточними напрямками не можливо з’єднати. Чи бажаєте ви змінити "
+"напрямок однієї з них на протилежний?"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
+msgid ""
+"Could not combine ways (They could not be merged into a single string of "
+"nodes)"
+msgstr "Не вдалося з'єднати лінії (Неможливо створити єдиний ланцюг з вузлів)"
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
+#, java-format
+msgid "Combine {0} ways"
+msgstr "З’єднати лінії — {0} шт."
+
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
+msgid "Please select at least two ways to combine."
+msgstr "Будь ласка, виберіть принаймні дві лінії для з'єднання"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:122
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:323
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:230
+msgid "Copy"
+msgstr "Копіювати"
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
+msgid "Copy selected objects to paste buffer."
+msgstr "Копіювати виділені об'єкти до буферу обміну."
+
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
+msgid "Please select something to copy."
+msgstr "Будь ласка, виберіть що-небудь для копіювання."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:45
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272
+msgid "Create Circle"
+msgstr "Створити коло"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44
+msgid "Create a circle from three selected nodes."
+msgstr "Створити коло за трьома виділеним точкам"
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:204
+msgid "Those nodes are not in a circle. Aborting."
+msgstr "Ці точки не в колі. Операція скасована."
+
+#: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
+msgid ""
+"Please select exactly two or three nodes or one way with exactly two or "
+"three nodes."
+msgstr ""
+"Будь ласка, виберіть дві чи три точки або лінію з двома чи трьома точками."
+
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:370
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:507
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:92
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:101
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:753
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:246
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:278
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:62
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
+msgid "Delete"
+msgstr "Вилучити"
+
+#: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
+msgid "Delete selected objects."
+msgstr "Вилучити виділені об'єкти."
+
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:206
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:207
+msgid "Overwrite"
+msgstr "Перезаписати"
+
+#: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:59
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:209
+msgid "File exists. Overwrite?"
+msgstr "Файл вже існує. Перезаписати?"
+
+#. Do it!
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:134
+msgid "Distribute Nodes"
+msgstr "Розташувати точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
+msgid "Distribute the selected nodes to equal distances along a line."
+msgstr "Розташувати точки на рівних відстанях вздовж лінії."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+msgid "Download from OSM..."
+msgstr "Завантажити з OSM…"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+msgid "Download map data from the OSM server."
+msgstr "Завантажити дані мапи з серверу OSM."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
+msgid "Download object..."
+msgstr "Завантажити об’єкт…"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37
+msgid "Download OSM object by ID."
+msgstr "Завантажити об'єкт OSM за ідентифікатором"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38
+msgid "Download Object..."
+msgstr "Завантажити об'єкт..."
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:43
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:69
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:77
+msgid "Separate Layer"
+msgstr "Окремий шар"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
+msgid "Select if the data should be downloaded into a new layer"
+msgstr "Позначте, якщо дані повинні бути завантажені у новий шар"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46
+msgid "Download referrers"
+msgstr "Завантажити дані, що посилаються на поточний об’єкт"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
+msgid "Select if the referrers of the object should be downloaded as well"
+msgstr ""
+"Позначте, якщо дані, що посилаються на поточний об'єкт, теж повинні бути "
+"завантажені"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:86
+msgid "Object type:"
+msgstr "Тип об'єкту:"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:57
+msgid "Choose the OSM object type"
+msgstr "Оберіть тип об’єкту OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:93
+msgid "Object ID:"
+msgstr "Ідентифікатор об'єкту:"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:64
+msgid "Enter the ID of the object that should be downloaded"
+msgstr "Введіть ідентифікатор об'єкту, який потрібно завантажити з сервера"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77
+msgid "Download Object"
+msgstr "Завантажити об'єкт з сервера"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
+msgid "Download object"
+msgstr "Завантажити об’єкт"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:83
+msgid "Start downloading"
+msgstr "Почати завантаження"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:95
+msgid "Close dialog and cancel downloading"
+msgstr "Закрити діалог та скасувати завантаження"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:30
+msgid "Download parent ways/relations..."
+msgstr "Завантажити батьківські лінії/зв'язки…"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
+msgid "Download primitives referring to one of the selected primitives"
+msgstr "Завантажити елементи, які посилаються на один із виділених елементів"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1374
+msgid "Duplicate"
+msgstr "Дублювати"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:20
+msgid "Duplicate selection by copy and immediate paste."
+msgstr "Дублювати виділення шляхом копіювання і вставки."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+msgid "Duplicate Layer"
+msgstr "Дублювати шар"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Зробити копію виділеного шару"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
+#, java-format
+msgid "Layer: {0}"
+msgstr "Шар: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, java-format
+msgid "Copy of {0}"
+msgstr "Копія {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr "Копія {1} з {0}"
+
+#. <button label="Info" hotkey="I">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:24
+#: build/trans_surveyor.java:68
+msgid "Exit"
+msgstr "Вихід"
+
+#: ../core/src/org/openstreetmap/josm/actions/ExitAction.java:23
+msgid "Exit the application."
+msgstr "Вийти з програми."
+
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
+msgid "Fullscreen View"
+msgstr "Повноекранний режим"
+
+#. no icon
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:32
+msgid "Toggle fullscreen view"
+msgstr "Ввімкнути/вимкнути повноекранний режим"
+
+#: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:33
+msgid "Toggle Fullscreen view"
+msgstr "Ввімкнути/вимкнути повноекранний режим"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:31
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:278
+msgid "Export to GPX..."
+msgstr "Експортувати до GPX…"
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:30
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:277
+msgid "Export the data to GPX file."
+msgstr "Експортувати дані до GPX файлу."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:50
+msgid "Nothing to export. Get some data first."
+msgstr "Нічого експортувати. Спочатку отримайте дані."
+
+#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:75
+msgid "Export GPX file"
+msgstr "Експортувати GPX-файл"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
+msgid "Object history"
+msgstr "Історія об’єкту"
+
+#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
+msgid "Display history information about OSM ways, nodes, or relations."
+msgstr "Показати історію лінії, точки або зв'язку OSM."
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:19
+msgid "Info about Element"
+msgstr "Інформація про елемент"
+
+#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
+msgid "Display object information about OSM nodes, ways, or relations."
+msgstr "Показати інформацію про лінії, точки або зв'язки OSM."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
+msgid "Join overlapping Areas"
+msgstr "Об’єднати ділянки, що перекриваються"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
+msgid "Joins areas that overlap each other"
+msgstr "Об’єднати ділянки, що перекривають друг друга"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
+msgid "Please select at least one closed way that should be joined."
+msgstr ""
+"Будь ласка, виберіть принаймні одну замкнену лінію, яку потрібно приєднати."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
+msgid "Only up to two areas can be joined at the moment."
+msgstr "Тільки дві ділянки можуть бути зараз об’єднані"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:139
+#, java-format
+msgid "\"{0}\" is not closed and therefore cannot be joined."
+msgstr "\"{0}\" не замкнена, і тому не може бути приєднана"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
+msgid "The selected way has nodes outside of the downloaded data region."
+msgid_plural ""
+"The selected ways have nodes outside of the downloaded data region."
+msgstr[0] "Вибрана лінія містить точки поза межами завантаженої області."
+msgstr[1] "Вибрані лінії містять точки поза межами завантаженої області."
+msgstr[2] "Вибрані лінії містять точки поза межами завантаженої області."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85
+msgid "This can lead to nodes being deleted accidentally."
+msgstr "Це може призвести до випадкового вилучення точок."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
+msgid "Are you really sure to continue?"
+msgstr "Ви справді бажаєте продовжити?"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
+msgid "Please abort if you are not sure"
+msgstr "Будь ласка, зупиніться, якщо ви не впевнені"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
+msgid "No intersection found. Nothing was changed."
+msgstr "Не знайдено перетинів. Нічого не змінено."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
+msgid "Added node on all intersections"
+msgstr "Додані на всіх перетинах точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+msgid "Delete Ways that are not part of an inner multipolygon"
+msgstr "Вилучити лінії, що не належать до внутрішньої частини мультиполігону"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+msgid "Fix relations"
+msgstr "Виправити зв’язки"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+msgid "Joined self-overlapping area"
+msgstr "Приєднана ділянка, що перекриває сама себе"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
+msgid "Joined overlapping areas"
+msgstr "Об’єднані ділянки, що перекриваються"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
+msgid ""
+"Some of the ways were part of relations that have been modified. Please "
+"verify no errors have been introduced."
+msgstr ""
+"Деякі з ліній належали до зв’язків, які було змінено. Будь ласка, перевірте, "
+"чи не виникло помилок."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
+msgid "Enter values for all conflicts."
+msgstr "Введіть значення для всіх конфліктів."
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
+msgid "Solve Conflicts"
+msgstr "Розв’язати конфлікти"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
+msgid "Fix tag conflicts"
+msgstr "Виправити конфлікти теґів"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
+msgid "Removed Element from Relations"
+msgstr "Вилучений зі зв’язків елемент"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
+msgid "Join Areas: Remove Short Ways"
+msgstr "Об'єднати ділянки: вилучити короткі лінії"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
+msgid "Closed Way"
+msgstr "Замкнена лінія"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
+msgid "Remove tags from inner ways"
+msgstr "Вилучити теґи з внутрішніх ліній"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
+msgid "Join Areas Function"
+msgstr "Функція об'єднання ділянок"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:31
+msgid "Join Node to Way"
+msgstr "Приєднати точку до лінії"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
+msgid "Join a node into the nearest way segments"
+msgstr "Приєднати точку до найближчого відрізку лінії"
+
+#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
+msgid "Join Node and Line"
+msgstr "З'єднати точку і лінію"
+
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
+msgid "No Shortcut"
+msgstr "Відсутній ярлик"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+msgid "Jump To Position"
+msgstr "Перейти до позиції"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
+msgid "Opens a dialog that allows to jump to a specific location"
+msgstr "Відкриває діалог, що дозволяє перейти до певної позиції"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57
+msgid "Enter Lat/Lon to jump to position."
+msgstr "Введіть координати, щоб перейти до позиції"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59
+msgid "You can also paste an URL from www.openstreetmap.org"
+msgstr "Ви також можете вставити URL з www.openstreetmap.org"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91
+msgid "Zoom (in metres)"
+msgstr "Масштаб (в метрах)"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
+msgid "Jump there"
+msgstr "Перейти туди"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:104
+msgid "Jump to Position"
+msgstr "Перейти до позиції"
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
+msgid "Could not parse Latitude, Longitude or Zoom. Please check."
+msgstr "Неможливо розібрати широту, довготу чи масштаб. Будь ласка, перевірте."
+
+#: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:116
+msgid "Unable to parse Lon/Lat"
+msgstr "Неможливо розібрати довготу/широту"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+msgid "Merge layer"
+msgstr "Об'єднати шари"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
+msgid "Merge the current layer into another layer"
+msgstr "Об'єднати поточний шар з іншим шаром"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:55
+msgid "Merge Nodes"
+msgstr "З'єднати точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+msgid "Merge nodes into the oldest one."
+msgstr "З'єднати точки в одну (найдавнішу)."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:67
+msgid "Please select at least two nodes to merge."
+msgstr "Будь ласка, виберіть принаймні дві точки для з'єднання."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:159
+msgid "Abort Merging"
+msgstr "Скасувати об'єднання"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:161
+msgid "Click to abort merging nodes"
+msgstr "Натисніть, щоб скасувати об'єднання точок"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#, java-format
+msgid ""
+"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
+msgstr ""
+"Неможливо з’єднати точки: Треба вилучити лінію \"{0}\", яка ще "
+"використовується."
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:269
+#, java-format
+msgid "Merge {0} nodes"
+msgstr "Об’єднати {0} точок"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:23
+msgid "Merge selection"
+msgstr "Об'єднати виділене"
+
+#: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:22
+msgid "Merge the currently selected primitives into another layer"
+msgstr "Об'єднати виділені об'єкти в інший шар"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:77
+msgid "Mirror"
+msgstr "Віддзеркалити"
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
+msgid "Mirror selected nodes and ways."
+msgstr "Віддзеркалити виділені точки та лінії."
+
+#: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55
+msgid "Please select at least one node or way."
+msgstr "Будь ласка, виберіть принаймні одну точку або лінію."
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37
+msgid "up"
+msgstr "вгору"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:47
+#, java-format
+msgid "Move objects {0}"
+msgstr "Пересунути об’єкти {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:40
+msgid "down"
+msgstr "вниз"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:43
+msgid "left"
+msgstr "ліворуч"
+
+#. dir == Direction.RIGHT) {
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:46
+msgid "right"
+msgstr "праворуч"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:56
+#, java-format
+msgid "Move {0}"
+msgstr "Перемістити {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:57
+#, java-format
+msgid "Moves Objects {0}"
+msgstr "Переміщує об’єкти {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
+msgid "Cannot move objects outside of the world."
+msgstr "Неомжливо перемістити об'єкти поза межі світу."
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:19
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:624
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:316
+msgid "New"
+msgstr "Створити"
+
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+msgid "Create a new map."
+msgstr "Створити нову мапу."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:48
+msgid "Open..."
+msgstr "Відкрити…"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:47
+msgid "Open a file."
+msgstr "Відкрити файл."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:82
+msgid "Opening files"
+msgstr "Відкриття файлів"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:101
+#, java-format
+msgid "Cannot open {0} file with the file importer ''{1}''."
+msgid_plural "Cannot open {0} files with the file importer ''{1}''."
+msgstr[0] ""
+"Неможливо відкрити {0} файл за допомогою транслятора файлів ''{1}''."
+msgstr[1] ""
+"Неможливо відкрити {0} файла за допомогою транслятора файлів ''{1}''."
+msgstr[2] ""
+"Неможливо відкрити {0} файлів за допомогою транслятора файлів ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
+#, java-format
+msgid "Cannot open {0} file because no suitable file importer is available."
+msgid_plural ""
+"Cannot open {0} files because no suitable file importer is available."
+msgstr[0] ""
+"Неможливо відкрити {0} файл, тому що відсутній придатний транслятор файлів."
+msgstr[1] ""
+"Неможливо відкрити {0} файли, тому що відсутній придатний транслятор файлів."
+msgstr[2] ""
+"Неможливо відкрити {0} файлів, тому що відсутній придатний транслятор файлів."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189
+#, java-format
+msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
+msgstr ""
+"<html>Неможливо відкрити каталог ''{0}''.<br>Будь ласка, виберіть файл.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
+msgid "Open file"
+msgstr "Відкрити файл"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:252
+msgid "Opening 1 file..."
+msgstr "Відкриття 1 файлу…"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:254
+#, java-format
+msgid "Opening {0} file..."
+msgid_plural "Opening {0} files..."
+msgstr[0] "Відкриття {0} файлу…"
+msgstr[1] "Відкриття {0} файлів…"
+msgstr[2] "Відкриття {0} файлів…"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:262
+#, java-format
+msgid "Opening file ''{0}'' ..."
+msgstr "Відкриття файлу \"{0}\" …"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:40
+msgid "Open Location..."
+msgstr "Відкрити адресу…"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:39
+msgid "Open an URL."
+msgstr "Відкрити URL посилання."
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
+msgid "Enter URL to download:"
+msgstr "Введіть URL посилання для завантаження з сервера:"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:79
+msgid "Enter an URL from where data should be downloaded"
+msgstr "Введіть URL посилання на дані, що повинні бути завантажені"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:88
+msgid "Download Location"
+msgstr "Шлях для завантаження"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
+msgid "Download URL"
+msgstr "URL для завантаження"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:94
+msgid "Start downloading data"
+msgstr "Почати завантаження даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
+msgid "Download Data"
+msgstr "Завантажити дані"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
+msgid ""
+"<h3>When one or more ways are selected, the shape is adjusted such, that all "
+"angles are 90 or 180 degrees.</h3>You can add two nodes to the selection. "
+"Then, the direction is fixed by these two reference nodes. (Afterwards, you "
+"can undo the movement for certain nodes:<br>Select them and press the "
+"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
+msgstr ""
+"<h3>Коли виділена одна чи більше ліній, форма змінюється таким чином, що всі "
+"кути становитимуть 90 або 180 градусів.</h3>Ви можете додати дві додаткові "
+"точки. Тоді напрямок буде змінено згідно до цих опорних точок. (Пізніше, ви "
+"можете відмінити переміщення певних точок:<br>Виберіть їх та натисніть "
+"комбінацію клавіш для дій \"Зробити прямі кути / Відмінити\". Типово це Shift"
+"+Q.)"
+
+#: ../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:199
+msgid "Orthogonalize Shape"
+msgstr "Зробити кути прямими"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
+msgid "Move nodes so all angles are 90 or 180 degrees"
+msgstr "Перемістити точки так, щоб всі кути стали 90 або 180 градусів"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81
+msgid "Orthogonalize Shape / Undo"
+msgstr "Зробити у форми кути прямими / Відмінити"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80
+msgid "Undo orthogonalization for certain nodes"
+msgstr ""
+"Відмінити переміщення точок, що були зроблені для створення прямих кутів"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:101
+msgid "Orthogonalize / Undo"
+msgstr "Зробити прямі кути / Відмінити"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108
+msgid ""
+"Orthogonalize Shape / Undo\n"
+"Please select nodes that were moved by the previous Orthogonalize Shape "
+"action!"
+msgstr ""
+"Зробити кути прямим / Відмінити\n"
+"Будь ласка, виберіть точки, які були зміщені попередньою дією \"Зробити кути "
+"прямими\"!"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
+msgid "Undo Orthogonalize Shape"
+msgstr "Відмінити випрямлення кутів"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:120
+msgid ""
+"<html>You are using the EPSG:4326 projection which might lead<br>to "
+"undesirable results when doing rectangular alignments.<br>Change your "
+"projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+"<html>Ви використовуєте проекцію EPSG:4326, що може призвести<br>до "
+"небажаних результатів при позиціонуванні прямокутних форм.<br>Змініть "
+"проекцію щоб позбутись цього попередження.<br>Чи бажаєте ви продовжити?</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
+msgid "Selection must consist only of ways and nodes."
+msgstr "Повинні бути вибрані лише лінії та точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:188
+msgid "Orthogonalize"
+msgstr "Зробити кути прямими"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:205
+msgid "Usage"
+msgstr "Використання"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:206
+msgid "Selected Elements cannot be orthogonalized"
+msgstr "Для виділених елементів неможливо зробити прямі кути"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:264
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+"<html>Будь ласка, переконайтесь, що всі виділені лінії мають однаковий "
+"напрямок<br>або вирівнюйте їх по одній.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Будь ласка, виберіть ліній з кутами, близькими до 90 або 180 градусів."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:33
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:292
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:233
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:127
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:353
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:263
+msgid "Paste"
+msgstr "Вставити"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
+msgid "Paste contents of paste buffer."
+msgstr "Вставити вміст буферу."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
+msgid "Delete incomplete members?"
+msgstr "Вилучити неповних членів?"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
+msgid "Paste without incomplete members"
+msgstr "Вставити без неповних членів"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
+msgid ""
+"The copied data contains incomplete primitives.  When pasting the incomplete "
+"primitives are removed.  Do you want to paste the data without the "
+"incomplete primitives?"
+msgstr ""
+"Скопійовані дані містять неповні елементи. Після вставки неповні елементи "
+"будуть вилучені. Чи бажаєте ви вставити дані без неповних елементів?"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:34
+msgid "Paste Tags"
+msgstr "Вставити теґи"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
+msgid "Apply tags of contents of paste buffer to all selected items."
+msgstr "Застосувати теґи з буферу до всіх виділених об'єктів."
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
+#, java-format
+msgid "Pasting {0} tag"
+msgid_plural "Pasting {0} tags"
+msgstr[0] "Вставляється {0} теґ"
+msgstr[1] "Вставляється {0} теґи"
+msgstr[2] "Вставляється {0} теґів"
+
+#: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:110
+#, java-format
+msgid "to {0} primitive"
+msgid_plural "to {0} primtives"
+msgstr[0] "для {0} елемента"
+msgstr[1] "для {0} елементів"
+msgstr[2] "для {0} елементів"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+msgid "Preferences..."
+msgstr "Налаштування…"
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
+msgid "Open a preferences dialog for global settings."
+msgstr "Відкрити діалог налаштувань для загальних параметрів."
+
+#: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:60
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:95
+msgid "Preferences"
+msgstr "Налаштування"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:25
+msgid "Redo"
+msgstr "Повернути"
+
+#: ../core/src/org/openstreetmap/josm/actions/RedoAction.java:24
+msgid "Redo the last undone action."
+msgstr "Повернути останню скасовану дію."
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:65
+msgid "Rename layer"
+msgstr "Перейменувати Шар"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:47
+msgid "Also rename the file"
+msgstr "Також змінити назву файлу"
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
+#, java-format
+msgid "Could not rename file ''{0}''"
+msgstr "Не можливо перейменувати файл \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:308
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:453
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:464
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:487
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:500
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:103
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:119
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:59
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:79
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:46
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:134
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:416
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1092
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:167
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:230
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:625
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:255
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:351
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:176
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:85
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:100
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1098
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:65
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:70
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:194
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:66
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:82
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:67
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:72
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
+msgid "Error"
+msgstr "Помилка"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:31
+msgid "Reverse Ways"
+msgstr "Змінити напрямок лінії"
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:30
+msgid "Reverse the direction of all selected ways."
+msgstr "Змінити напрямок всіх позначених ліній."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:45
+msgid "Please select at least one way."
+msgstr "Будь ласка, оберіть, принаймні, одну лінію."
+
+#: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:75
+msgid "Reverse ways"
+msgstr "Змінити напрямок ліній"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../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:248
+msgid "Save"
+msgstr "Зберегти"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:247
+msgid "Save the current data."
+msgstr "Зберегти поточні дані."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:47
+#, java-format
+msgid "File {0} exists. Overwrite?"
+msgstr "Файл {0} існує. Перезаписати?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
+msgid "No Exporter found! Nothing saved."
+msgstr "Транслятор не знайдений. Нічого не збережено."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
+msgid "Empty document"
+msgstr "Порожній документ"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
+msgid "Save anyway"
+msgstr "Всеодно зберегти"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
+msgid "The document contains no data."
+msgstr "Документ не містить даних."
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:112
+msgid "Conflicts"
+msgstr "Конфлікти"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
+msgid "Reject Conflicts and Save"
+msgstr "Відкинути конфлікти та зберегти"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
+msgid ""
+"There are unresolved conflicts. Conflicts will not be saved and handled as "
+"if you rejected all. Continue?"
+msgstr ""
+"Є невирішені конфлікти. Конфлікти не будуть зберігатися і оброблятися, ніби "
+"ви відкинули їх  всі. Продовжити?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
+msgid "Save OSM file"
+msgstr "Зберегти файл OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:128
+msgid "Save GPX file"
+msgstr "Зберегти файл GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:129
+msgid "Save Layer"
+msgstr "Зберегти шар"
+
+#: ../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:263
+msgid "Save As..."
+msgstr "Зберегти як…"
+
+#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
+#: ../core/src/org/openstreetmap/josm/gui/layer/Layer.java:262
+msgid "Save the current data to a new file."
+msgstr "Зберегти поточні дані в новий файл."
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
+msgid "Select All"
+msgstr "Виділити все"
+
+#: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
+msgid ""
+"Select all undeleted objects in the data layer. This selects incomplete "
+"objects too."
+msgstr "ні об'єкти шару даних. Також будуть виділені неповні об'єкти."
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:43
+msgid "Show Status Report"
+msgstr "Показати звіт про стан"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
+msgid "Show status report with useful information that can be attached to bugs"
+msgstr ""
+"Показує звіт про стан, що містить корисну інформацію, яку можна прикріпити "
+"до повідомлення про помилку"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
+#, java-format
+msgid "Help: {0}"
+msgstr "Довідка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:119
+msgid "Status Report"
+msgstr "Звіт про стан"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+msgid "Copy to clipboard and close"
+msgstr "Скопіювати в буфер і закрити"
+
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:966
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
+msgid "Close"
+msgstr "Закрити"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
+msgid "Simplify Way"
+msgstr "Спростити лінію"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:38
+msgid "Delete unnecessary nodes from a way."
+msgstr "Вилучити з лінії непотрібні точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
+msgid "Yes, delete nodes"
+msgstr "Так, вилучити точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67
+msgid "Delete nodes outside of downloaded data regions"
+msgstr "Вилучити точки за межами завантажених з сервера даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+msgid "No, abort"
+msgstr "Ні, скасувати"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:73
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:119
+msgid "Cancel operation"
+msgstr "Відмінити операцію"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86
+msgid "Do you want to delete them anyway?"
+msgstr "Ви все одно хочете їх вилучити?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:88
+msgid "Delete nodes outside of data regions?"
+msgstr "Вилучити точки за межами області даних?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101
+msgid "Please select at least one way to simplify."
+msgstr "Виберіть хоча б одну лінію для спрощення."
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:111
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
+msgid "Yes"
+msgstr "Так"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:113
+msgid "Simplify all selected ways"
+msgstr "Спростити всі виділені лінії"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
+#, java-format
+msgid ""
+"The selection contains {0} ways. Are you sure you want to simplify them all?"
+msgstr ""
+"Виділення містить лінії у кількості {0} шт. Ви впевнені, що треба спростити "
+"їх всі?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129
+msgid "Simplify ways?"
+msgstr "Спростити лінії?"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:180
+#, java-format
+msgid "Simplify {0} way"
+msgid_plural "Simplify {0} ways"
+msgstr[0] "Спростити {0} лінію"
+msgstr[1] "Спростити {0} лінії"
+msgstr[2] "Спростити {0} ліній"
+
+#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:251
+#, java-format
+msgid "Simplify Way (remove {0} node)"
+msgid_plural "Simplify Way (remove {0} nodes)"
+msgstr[0] "Спростити лінію (вилучити {0} точку)"
+msgstr[1] "Спростити лінію (вилучити {0} точки)"
+msgstr[2] "Спростити лінію (вилучити {0} точок)"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
+msgid "Split Way"
+msgstr "Розділити лінію"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:83
+msgid "Split a way at the selected node."
+msgstr "Розділити лінію у виділеній точці."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:104
+msgid "The current selection cannot be used for splitting."
+msgstr "Поточне виділення неможливо розділити."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:144
+msgid "The selected node is not in the middle of any way."
+msgid_plural "The selected nodes are not in the middle of any way."
+msgstr[0] "Виділена точка не знаходиться в середині будь-якої лінії."
+msgstr[1] "Виділені точки не знаходиться в середині будь-якої лінії."
+msgstr[2] "Виділені точки не знаходиться в середині будь-якої лінії."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
+msgid ""
+"There is more than one way using the node you selected. Please select the "
+"way also."
+msgid_plural ""
+"There is more than one way using the nodes you selected. Please select the "
+"way also."
+msgstr[0] ""
+"Є кілька ліній, що використовують точку, яку ви виділили. Будь ласка, "
+"виділіть також лінію."
+msgstr[1] ""
+"Є кілька ліній, що використовують точки, які ви виділили. Будь ласка, "
+"виділіть також лінію."
+msgstr[2] ""
+"Є кілька ліній, що використовують точки, які ви виділили. Будь ласка, "
+"виділіть також лінію."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
+msgid "The selected nodes do not share the same way."
+msgstr "Виділені точки не є частиною однієї лінії."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:182
+msgid "The selected way does not contain the selected node."
+msgid_plural "The selected way does not contain all the selected nodes."
+msgstr[0] "Виділена лінія не містить виділену точку."
+msgstr[1] "Виділена лінія не містить виділених точок"
+msgstr[2] "Виділена лінія не містить всіх виділених точок"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
+msgid "You must select two or more nodes to split a circular way."
+msgstr "Щоб розділити замкнену лінію, виділіть не менше двох точок."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
+msgid ""
+"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
+"middle of the way.)"
+msgstr ""
+"Лінію неможливо розділити у виділених точках. (Виділіть точки в середині "
+"лінії)."
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
+msgid ""
+"<html>A role based relation membership was copied to all new ways.<br>You "
+"should verify this and correct it when necessary.</html>"
+msgstr ""
+"<html>Роль, заснована на участі у зв’язках, була скопійована у всі нові "
+"лінії.<br>Результат необхідно перевірити і виправити, якщо буде потрібно.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
+msgid ""
+"<html>A relation membership was copied to all new ways.<br>You should verify "
+"this and correct it when necessary.</html>"
+msgstr ""
+"<html>Член зв’язку був скопійований у всі нові лінії. <br> Результат "
+"потрібно перевірити та виправити за потреби.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
+#, java-format
+msgid "Split way {0} into {1} parts"
+msgstr "Розділити лінію {0} на {1} частин"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
+msgid "Toggle GPX Lines"
+msgstr "Показати/сховати лінії GPX"
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+msgid "Draw lines between raw gps points."
+msgstr "Показувати лінії між точками треків GPS."
+
+#: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
+#, java-format
+msgid "Toggles the global setting ''{0}''."
+msgstr "Включити/виключити загальні параметри: \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
+msgid "UnGlue Ways"
+msgstr "Роз'єднати лінії"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
+msgid "Duplicate nodes that are used by multiple ways."
+msgstr "Дублювати точки, що використовуються кількома лініями."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:82
+msgid "This node is not glued to anything else."
+msgstr "Ця точка ні до чого не прикріплена."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:104
+msgid "None of these nodes are glued to anything else."
+msgstr "Жодна з цих точок ні до чого не прикріплена."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
+msgid "None of this way''s nodes are glued to anything else."
+msgstr ""
+"Жодна з цих точок, що знаходяться на лініях, ні до чого не прикріплена."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
+msgid "The current selection cannot be used for unglueing."
+msgstr "Виділені об'єкти неможливо роз'єднати."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:117
+msgid "Select either:"
+msgstr "Виберіть один з варіантів:"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:118
+msgid "* One tagged node, or"
+msgstr "* Одна точка с теґами, або"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:119
+msgid "* One node that is used by more than one way, or"
+msgstr "* Одна точка, що використовується декількома лініям, або"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:120
+msgid "* One node that is used by more than one way and one of those ways, or"
+msgstr ""
+"* Одна точка, що використовується декількома лініям та одною з цих ліній, або"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
+msgid ""
+"* One way that has one or more nodes that are used by more than one way, or"
+msgstr ""
+"* Одна лінія, що має одну чи кілька точок, що використовуються декількома "
+"лініями, або"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
+msgid ""
+"* One way and one or more of its nodes that are used by more than one way."
+msgstr ""
+"* Одна лінія та одна чи кілька її точок, що використовуються декількома "
+"лініями."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
+msgid ""
+"Note: If a way is selected, this way will get fresh copies of the unglued\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get "
+"their\n"
+"own copy and all nodes will be selected."
+msgstr ""
+"Примітка: Якщо виділена лінія, вона отримає дублікати точок, і вони\n"
+"будуть виділені. В іншому випадку, всі лінії отримають дублікати\n"
+"і всі точки будуть виділені."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:166
+msgid "Unglued Node"
+msgstr "Не прикріплена точка"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:369
+#, java-format
+msgid "Dupe into {0} nodes"
+msgstr "Дублювати у {0} точок"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
+#, java-format
+msgid "Dupe {0} node into {1} nodes"
+msgid_plural "Dupe {0} nodes into {1} nodes"
+msgstr[0] "Створити {1} копію точки {0}"
+msgstr[1] "Створити {1} копії точок {0}"
+msgstr[2] "Створити {1} копій точок {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
+msgid "Undo"
+msgstr "Відмінити"
+
+#: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
+msgid "Undo the last action."
+msgstr "Відмінити останню дію."
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+msgid "Unselect All"
+msgstr "Скинути виділення"
+
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+msgid "Unselect all objects."
+msgstr "Скинути виділення зі всіх об’єктів"
+
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+msgid "Unselect All (Focus)"
+msgstr "Скинути виділення (Фокус)"
+
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+msgid "Unselect All (Escape)"
+msgstr "Скинути виділення (Escape)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:23
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:27
+msgid "Update data"
+msgstr "Оновити дані"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25
+msgid "Updates the objects in the active data layer from the server."
+msgstr "Оновлює об'єкти в активному шарі даних, одержуючи їх із сервера."
+
+#. bounds defined? => use the bbox downloader
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1002
+msgid "Download data"
+msgstr "Отримати дані"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:24
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:28
+msgid "Update modified"
+msgstr "Оновити змінене"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:26
+msgid ""
+"Updates the currently modified objects from the server (re-downloads data)"
+msgstr ""
+"Оновити поточні змінені об’єкти даними з сервера (перезавантажити дані)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
+msgid "No current dataset found"
+msgstr "Поточний набір даних не знайдено"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
+#, java-format
+msgid "Did not find an object with id {0} in the current dataset"
+msgstr "Об’єкта з ідентифікатором {0} немає в поточному наборі даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
+msgid "Update selection"
+msgstr "Оновити виділене"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87
+msgid ""
+"Updates the currently selected objects from the server (re-downloads data)"
+msgstr ""
+"Оновити поточні виділені об’єкти даними з сервера (перезавантажити дані)"
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
+msgid "There are no selected objects to update."
+msgstr "Немає вибраних для оновлення об'єктів."
+
+#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
+msgid "Selection empty"
+msgstr "Вибірка порожня"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:89
+msgid "Upload data"
+msgstr "Надіслати дані на сервер"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
+msgid "Upload all changes in the active data layer to the OSM server"
+msgstr "Надіслати всі зміни з активного шару на сервер OSM"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
+#, java-format
+msgid ""
+"<html>The data to be uploaded participates in unresolved conflicts of layer "
+"''{0}''.<br>You have to resolve them first.</html>"
+msgstr ""
+"<html>Дані, що надсилаються, мають нерозв’язані конфлікти у шарі ''{0}''."
+"<br>Спочатку розв’яжіть конфлікти.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:116
+msgid "No changes to upload."
+msgstr "Немає змін для надсилання."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
+msgid "Nothing to upload. Get some data first."
+msgstr "Нічого надсилати. Сопчатку отримайте деякі дані."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:45
+msgid "Upload selection"
+msgstr "Надіслати на сервер виділене"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
+msgid "Upload all changes in the current selection to the OSM server."
+msgstr "Надіслати на сервер OSM всі зміни виділених об’єктів."
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:257
+msgid "Checking parents for deleted objects"
+msgstr "Перевірка батьків об’єкті, що вилучаються"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:316
+#, java-format
+msgid "Reading parents of ''{0}''"
+msgstr "Читання батьків для \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:322
+msgid "Checking for deleted parents in the local dataset"
+msgstr "Перевірка на вилучених батьків у локальному наборі даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23
+msgid "Wireframe View"
+msgstr "Каркас"
+
+#. no icon
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25
+msgid "Enable/disable rendering the map as wireframe only"
+msgstr ""
+"Дозволити/заборонити відтворення зображення мапи тільки у вигляді каркасу"
+
+#: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
+msgid "Toggle Wireframe view"
+msgstr "Показати/приховати каркас"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+msgid "Zoom In"
+msgstr "Наблизити"
+
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
+msgid "Zoom Out"
+msgstr "Віддалити"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+msgctxt "audio"
+msgid "Back"
+msgstr "Назад"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:19
+msgctxt "audio"
+msgid "Jump back."
+msgstr "Перемотати назад."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
+#, java-format
+msgid "Audio: {0}"
+msgstr "Звук: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:15
+msgctxt "audio"
+msgid "Faster"
+msgstr "Швидше"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java:14
+msgctxt "audio"
+msgid "Faster Forward"
+msgstr "Грати швидше."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:19
+msgctxt "audio"
+msgid "Forward"
+msgstr "Вперед"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java:18
+msgctxt "audio"
+msgid "Jump forward"
+msgstr "Перемотати вперед"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
+msgctxt "audio"
+msgid "Next Marker"
+msgstr "Наступна мітка"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
+msgctxt "audio"
+msgid "Play next marker."
+msgstr "Відтворити наступну мітку."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:19
+msgctxt "audio"
+msgid "Play/Pause"
+msgstr "Відтворення/пауза"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
+msgid "Play/pause audio."
+msgstr "Відтворити/призупинити звук."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
+msgctxt "audio"
+msgid "Previous Marker"
+msgstr "Попередня мітка"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
+msgctxt "audio"
+msgid "Play previous marker."
+msgstr "Відтворити попередні мітку."
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:15
+msgctxt "audio"
+msgid "Slower"
+msgstr "Повільніше"
+
+#: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
+msgctxt "audio"
+msgid "Slower Forward"
+msgstr "Відтворювати повільніше."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:49
+msgid "Downloading GPS data"
+msgstr "Отримання GPS-даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76
+msgid "Downloaded GPX Data"
+msgstr "Отримані GPX-дані"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82
+msgid "Downloading data"
+msgstr "Отримання даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94
+#, java-format
+msgid ""
+"Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr ""
+"Ігнорування винятків, оскільки завантаження було скасовано. Виняток: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:142
+msgid "No data found in this area."
+msgstr "У цьому місці немає даних."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:66
+#, java-format
+msgid "Download {0} of {1} ({2} left)"
+msgstr "Отримання {0} з {1} ({2} лишилось)"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
+msgid "Updating data"
+msgstr "Оновлення даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:147
+msgid "Check on the server"
+msgstr "Перевірити на сервері"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:149
+msgid ""
+"Click to check whether objects in your local dataset are deleted on the "
+"server"
+msgstr ""
+"Натисніть, щоб перевірити, чи не вилучені на сервері об’єкти з вашого "
+"локального набору даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:153
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:116
+msgid "Ignore"
+msgstr "Ігнорувати"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:155
+msgid "Click to abort and to resume editing"
+msgstr "Натисніть, щоб скасувати процес та продовжити правку"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:160
+#, java-format
+msgid ""
+"<html>There are {0} primitives in your local dataset which<br>might be "
+"deleted on the server. If you later try to delete or<br>update them the "
+"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
+"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
+"</strong> to ignore.<br></html>"
+msgstr ""
+"<html>Кількість елементів у вашому наборі даних — {0}, <br>вони можуть бути "
+"вилученими на сервері. В подальшому, якщо ви спробуєте вилучити "
+"або<br>оновити їх, сервер скоріш за все сповістить про<br>конфлікт."
+"<br><br>Натисніть <strong>{1}</strong> щоб перевірити стан цих "
+"елементів<br>на сервері.<br>Натисніть <strong>{2}</strong> щоб ігнорувати."
+"<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:173
+msgid "Deleted or moved primitives"
+msgstr "Вилучені або переміщені елементи"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:239
+#, java-format
+msgid "The following errors occurred during mass download: {0}"
+msgstr "Під час масивного завантаження виникли наступні помилки: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:240
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:91
+msgid "Errors during Download"
+msgstr "Помилки під час отримання даних"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:474
+#, java-format
+msgid "There was {0} conflict during import."
+msgid_plural "There were {0} conflicts during import."
+msgstr[0] "Стався {0} конфлікт під час імпорту."
+msgstr[1] "Сталося {0} конфлікти під час імпорту."
+msgstr[2] "Сталося {0} конфліктів під час імпорту."
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:181
+msgid "Conflict during download"
+msgid_plural "Conflicts during download"
+msgstr[0] "Конфлікт під час отримання даних з сервера"
+msgstr[1] "Конфлікти під час отримання даних з сервера"
+msgstr[2] "Конфліктів під час отримання даних з сервера"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:222
+#, java-format
+msgid "({0}/{1}) Loading parents of node {2}"
+msgstr "({0}/{1}) Завантаження батьків точки {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:223
+#, java-format
+msgid "({0}/{1}) Loading parents of way {2}"
+msgstr "({0}/{1}) Завантаження батьків лінії  {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:224
+#, java-format
+msgid "({0}/{1}) Loading parents of relation {2}"
+msgstr "({0}/{1}) Завантаження батьків зв’язку {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
+msgid "Errors during download"
+msgstr "Помилки під час отримання даних з сервера"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
+msgid "Delete Mode"
+msgstr "Режим вилучення"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
+msgid "Delete nodes or ways."
+msgstr "Стерти точки або лінії."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
+#, java-format
+msgid "Mode: {0}"
+msgstr "Режим {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:247
+msgid ""
+"Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
+"when deleting a way. Ctrl: delete referring objects."
+msgstr ""
+"Натисніть для вилучення. Shift: вилучити відрізок. Alt: не вилучати точки, "
+"що не використовуються, під час вилучення лінії. Ctrl: вилучити об’єкти, що "
+"посилаються на елементи, що вилучаються."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+msgid "Draw"
+msgstr "Креслити"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
+msgid "Draw nodes"
+msgstr "Зобразити точки"
+
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
+msgid "Mode: Draw Focus"
+msgstr "Режим: Зобразити Фокус"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
+msgid "Cannot add a node outside of the world."
+msgstr "Неможливо додати точку поза світом."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
+msgid "Add node"
+msgstr "Додати точку"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+msgid "Add node into way"
+msgstr "Додати точку до лінії"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
+msgid "Connect existing way to node"
+msgstr "Приєднати існуючу лінію до точки"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+msgid "Add a new node to an existing way"
+msgstr "Додати нову точку до існуючої лінії"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+msgid "Add node into way and connect"
+msgstr "Додати точку до лінії та приєднати"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
+msgid "Create new node."
+msgstr "Створити нову точку."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
+msgid "Select node under cursor."
+msgstr "Виділити точку під курсором."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
+#, java-format
+msgid "Insert new node into way."
+msgid_plural "Insert new node into {0} ways."
+msgstr[0] "Вставити нову точку в лінію."
+msgstr[1] "Вставити нову точку в {0} лінії"
+msgstr[2] "Вставити нову точку в {0} ліній"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
+msgid "Start new way from last node."
+msgstr "Почати нову лінію з останньої точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+msgid "Continue way from last node."
+msgstr "Продовжити лінію з останньої точки."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
+msgid "Finish drawing."
+msgstr "Закінчити креслення."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+msgid "Extrude"
+msgstr "Видавлювання"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+msgid "Create areas"
+msgstr "Створити ділянки"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
+msgid "Extrude Way"
+msgstr "Видавити лінію"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
+msgid "Move a segment along its normal, then release the mouse button."
+msgstr ""
+"Перемістить відрізок уздовж його перпендикуляра, потім відпустіть кнопку "
+"миші."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
+msgid "Draw a rectangle of the desired size, then release the mouse button."
+msgstr ""
+"Накреслить прямокутник потрібного розміру, потім відпустіть кнопку миші."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
+msgid ""
+"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
+"its normal."
+msgstr ""
+"Перемістить відрізок лінії, щоб створити прямокутник. Утримуючи Ctrl, "
+"перемістіть, відрізок уздовж його перпендикуляра."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
+msgid "Drag play head"
+msgstr "Перетягнути повзунок"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
+msgid ""
+"Drag play head and release near track to play audio from there; SHIFT"
+"+release to synchronize audio at that point."
+msgstr ""
+"Перетягніть повзунок до треку для його програвання з відповідного місця; "
+"Shift: для синхронізування звуку з цією точкою."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:305
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:159
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:783
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:107
+msgid "Select"
+msgstr "Вибрати"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
+msgid "Select, move and rotate objects"
+msgstr "Вибрати, перемістити і обертати об'єкти"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
+#, java-format
+msgid "Add and move a virtual new node to way"
+msgid_plural "Add and move a virtual new node to {0} ways"
+msgstr[0] "Додати та перемістити нову віртуальну точку"
+msgstr[1] "Додати та перемістити нову віртуальну точку на {0} лінії"
+msgstr[2] "Додати та перемістити нову віртуальну точку {0} ліній"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
+msgid "Move elements"
+msgstr "Перемістити елементи"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Move them"
+msgstr "Перемістити"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Undo move"
+msgstr "Відмінити переміщення"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#, java-format
+msgid ""
+"You moved more than {0} elements. Moving a large number of elements is often "
+"an error.\n"
+"Really move them?"
+msgstr ""
+"Ви перемістили більше ніж {0} елементів. Переміщення великої кількості "
+"елементів\n"
+"часто призводить до виникнення помилок. Дійсно перемістити їх ?"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:543
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr "Відпустіть кнопку миші для вибору об'єктів в прямокутнику."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:545
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Відпустіть кнопку миші, щоб припинити переміщення. Натисніть Ctrl для "
+"об'єднання з найближчою точкою."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
+msgid "Release the mouse button to stop rotating."
+msgstr "Відпустіть кнопку миші, щоб зупинити обертання."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
+msgid ""
+"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
+"Ctrl to rotate selected; or change selection"
+msgstr ""
+"Перемістить об'єкт шляхом перетягування; Натисніть Shift, щоб додати до "
+"виділеного (Ctrl для вилучення); Shift-Ctrl для обертання виділеного; або "
+"виділіть будь-що інше"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
+msgid "Zoom"
+msgstr "Масштаб"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
+msgid "Zoom and move map"
+msgstr "Змінювати масштаб та пересувати мапу"
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73
+msgid ""
+"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
+"move zoom with right button"
+msgstr ""
+"Зміна масштабу коліщатком миші, чи Ctrl+. або Ctrl+,; пересування мапи — Ctrl"
+"+стрілки (вгору/вниз/праворуч/ліворуч) або перетягуйте за допомогою правої "
+"кнопки миші"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+msgid "<not>"
+msgstr "<not>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+msgid "<or>"
+msgstr "<or>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
+msgid "<left parent>"
+msgstr "<left parent>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+msgid "<right parent>"
+msgstr "<right parent>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+msgid "<colon>"
+msgstr "<colon>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49
+msgid "<equals>"
+msgstr "<equals>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+msgid "<key>"
+msgstr "<key>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:50
+msgid "<question mark>"
+msgstr "<question mark>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:51
+msgid "<end-of-file>"
+msgstr "<end-of-file>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
+msgid "Search..."
+msgstr "Пошук…"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
+msgid "Search for objects."
+msgstr "Пошук об’єктів"
+
+#. -- prepare the combo box with the search expressions
+#.
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+msgid "Please enter a filter string."
+msgstr "Будь ласка, введіть рядок фільтра."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
+msgid "Please enter a search string."
+msgstr "Будь ласка, введіть рядок для пошуку."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
+msgid "Enter the search expression"
+msgstr "Введіть вираз для пошуку"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:153
+msgid "replace selection"
+msgstr "замінити виділене"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:154
+msgid "add to selection"
+msgstr "додати до виділеного"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
+msgid "remove from selection"
+msgstr "прибрати з виділеного"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:156
+msgid "find in selection"
+msgstr "знайти у виділеному"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:163
+msgid "case sensitive"
+msgstr "з врахуванням регістру"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:164
+msgid "regular expression"
+msgstr "регулярний вираз"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:179
+msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
+msgstr ""
+"<b>Baker Street</b> — ''Baker'' та ''Street'' у будь-якому ключі чи назві."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:180
+msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
+msgstr ""
+"<b>\"Baker Street\"</b> — ''Baker Street'' у будь-якому ключі чи назві."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:181
+msgid "<b>name:Bak</b> - ''Bak'' anywhere in the name."
+msgstr "<b>name:Bak</b> — ''Bak'' будь-де в назві."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:182
+msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
+msgstr "<b>type=route</b> — ключ ''type'' з точним значенням ''route''."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
+msgid ""
+"<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgstr ""
+"<b>type=*</b> — ключ ''type'' з будь-яким значенням. Також спробуйте "
+"<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
+msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
+msgstr "<b>-name:Bak</b> — назва не містить ''Bak''."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:185
+msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
+msgstr "<b>oneway?</b> — oneway=yes, true, 1 чи on"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:186
+msgid "<b>foot:</b> - key=foot set to any value."
+msgstr "<b>foot:</b> — key=foot встановити в будь-яке значення."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:187
+msgid "<u>Special targets:</u>"
+msgstr "<u>Спеціальні цілі:</u>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
+msgid ""
+"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr ""
+"<b>type:</b>object_type, де object_type — <b>node</b>(точка), <b>way</b>"
+"(ліния), <b>relation</b>(зв’язок)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
+msgid "<b>user:</b>... - all objects changed by user"
+msgstr "<b>user:</b>… — всі об’єкти, змінені користувачем"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
+msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
+msgstr "<b>user:anonymous</b> — все об’єкти, змінені анонімним користувачем"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
+msgid "<b>id:</b>... - object with given ID (0 for new objects)"
+msgstr ""
+"<b>id:</b>… — об’єкт із зазначеним ідентифікатором (0 для нових об’єктів)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
+msgid ""
+"<b>version:</b>... - object with given version (0 objects without an "
+"assigned version)"
+msgstr ""
+"<b>версія:</b>… — Об’єкт із вказаною версією (0 для об’єктів, без "
+"встановленої версії)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
+msgid ""
+"<b>changeset:</b>... - object with given changeset id (0 objects without "
+"assigned changeset)"
+msgstr ""
+"<b>набір змін:</b>… — об’єкт із вказаним ідентифікатором набору змін (0 для "
+"об’єктів, без призначеного набору змін)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
+msgid ""
+"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
+"min-max)"
+msgstr ""
+"<b>nodes:</b>… — об’єкт із зазначеною кількістю точок (nodes:кількість або "
+"nodes:мін-макс)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
+msgid ""
+"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
+"max)"
+msgstr ""
+"<b>tags:</b>… — об’єкт із зазначеною кількістю теґів (tags:кількість або "
+"tags:мін-макс)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
+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 ""
+"<b>timestamp:</b>… — об’єкт з цією часовою позначкою (<b>2009-11-"
+"12T14:51:09Z</b>, <b>2009-11-12</b> або <b>T14:51</b> …)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
+msgid "<b>modified</b> - all changed objects"
+msgstr "<b>modified</b> — усі змінені об’єкти"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+msgid "<b>selected</b> - all selected objects"
+msgstr "<b>selected</b> — усі виділені об’єкти"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:199
+msgid "<b>incomplete</b> - all incomplete objects"
+msgstr "<b>incomplete</b> — всі неповні об’єкти"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+msgid "<b>untagged</b> - all untagged objects"
+msgstr "<b>untagged</b> — всі об’єкти без теґів"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
+msgid ""
+"<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr ""
+"<b>child <i>вираз</i></b> — усі нащадки, об’єктів що відповідають виразу"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+msgid ""
+"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr ""
+"<b>parent <i>вираз</i></b> — усі батьки, об’єктів що відповідають виразу"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
+msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
+msgstr ""
+"Використовуйте <b>|</b> або <b>OR</b> щоб об'єднати вираження логічним «або»"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
+msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
+msgstr ""
+"Використовуйте <b>\"</b> для написання операторів (наприклад, якщо ключ "
+"містить <b>:</b>)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
+msgid ""
+"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
+"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
+msgstr ""
+"В середині рядків в лапках, перед символами <b>\"</b> та <b>\\</b> треба "
+"ставити додатковий зворотній слеш (ось так: <b>\\\"</b> и <b>\\\\</b>)."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
+msgid "Use <b>(</b> and <b>)</b> to group expressions"
+msgstr "Використовуйте <b>(</b> та <b>)</b> для групування виразів"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../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:48
+msgid "Filter"
+msgstr "Фільтр"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:216
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
+msgid "Search"
+msgstr "Пошук"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+msgid "Submit filter"
+msgstr "Додати фільтр"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+msgid "Start Search"
+msgstr "Почати пошук"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:345
+#, java-format
+msgid "No match found for ''{0}''"
+msgstr "Не знайдено збігів для ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:347
+#, java-format
+msgid "Nothing added to selection by searching for ''{0}''"
+msgstr "До виділеного нічого не додано в результаті пошуку ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:349
+#, java-format
+msgid "Nothing removed from selection by searching for ''{0}''"
+msgstr "Нічого не вилучено з виділеного в результаті пошуку ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:351
+#, java-format
+msgid "Nothing found in selection by searching for ''{0}''"
+msgstr "У виділеному нічого не знайдено під час пошуку ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:361
+#, java-format
+msgid "Found {0} matches"
+msgstr "Знайдено {0} збігів"
+
+#. case sensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:389
+msgctxt "search"
+msgid "CS"
+msgstr "з урахуванням регістру"
+
+#. case insensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:390
+msgctxt "search"
+msgid "CI"
+msgstr "без урахування регістру"
+
+#. regex search
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:392
+msgctxt "search"
+msgid "RX"
+msgstr "пошук за виразом"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#, java-format
+msgid ""
+"The regex \"{0}\" had a parse error at offset {1}, full error:\n"
+"\n"
+"{2}"
+msgstr ""
+"Помилка у виразі \"{0}\" у позиції {1}, повний текст помилки:\n"
+"\n"
+"{2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
+msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
+msgstr ""
+"Ключ не може бути порожнім, коли використовується оператор з теґом. Приклад "
+"використання: ключ=значення"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
+#, java-format
+msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
+msgstr "Помилка синтаксису шаблону: Шаблон {0} в {1} неприпустимий!"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:443
+#, java-format
+msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
+msgstr ""
+"Невідомий тип елементу: {0}. Дозволені значення: точка, лінія або зв’язко"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
+#, java-format
+msgid "Unexpected token. Expected {0}, found {1}"
+msgstr "епередбачений елемент. Очікувалось {0}, знайдено {1}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:610
+#, java-format
+msgid "Unexpected token: {0}"
+msgstr "Непередбачена конструкція: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
+msgid "Missing parameter for OR"
+msgstr "Відсутній параметр для OR"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:646
+msgid "Missing operator for NOT"
+msgstr "Відсутній параметр для NOT"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653
+msgid "Primitive id expected"
+msgstr "Очікується ідентифікатор елемента"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:655
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
+msgid "Range of numbers expected"
+msgstr "Очікується діапазон чисел"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
+msgid "Changeset id expected"
+msgstr "Очікується ідентифікатор набору змін"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663
+msgid "Version expected"
+msgstr "Очікується версія"
+
+#: ../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 ""
+"Попередження: автоматичне скорочення теґу ''{0}'' на вилученому об’єкті {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 ""
+"Довжина значення теґу ''{0}'' об’єкта {1} перевищує максимально дозволену "
+"довжину {2}. Довжина значення — {3}."
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
+msgid "Precondition Violation"
+msgstr "Порушення передумов"
+
+#: ../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} точок у лінії {1} перевищують максимально допустиму кількість точок {2}"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
+msgid "API Capabilities Violation"
+msgstr "Порушення можливостей API"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
+msgid "Cyclic dependency between relations:"
+msgstr "Циклічні залежності між зв’язками:"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
+#, java-format
+msgid ""
+"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
+"cannot upload them. Please edit the relations and remove the cyclic "
+"dependency.</html>"
+msgstr ""
+"<html>{0} зв’язки створили циклічну залежність, так як вони посилаються друг "
+"на друга.<br>JOSM не може надіслати їх на сервер. Будь ласка, виправте "
+"зв’язки, вилучивши циклічні посилання.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
+msgid "Relation ..."
+msgstr "Зв’язок…"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
+msgid "... refers to relation"
+msgstr "… належить до зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
+msgid "Cycling dependencies"
+msgstr "Циклічні залежності"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
+#, java-format
+msgid "Add node {0}"
+msgstr "Додати точку {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
+#, java-format
+msgid "Add way {0}"
+msgstr "Додати лінію {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
+#, java-format
+msgid "Add relation {0}"
+msgstr "Додати зв’язок {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
+#, java-format
+msgid "Added {0} object"
+msgid_plural "Added {0} objects"
+msgstr[0] "Додано {0} об’єкт"
+msgstr[1] "Додано {0} об’єкти"
+msgstr[2] "Додано {0} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:57
+#, java-format
+msgid "Change node {0}"
+msgstr "Змінити точку {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:58
+#, java-format
+msgid "Change way {0}"
+msgstr "Змінити лінію {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:59
+#, java-format
+msgid "Change relation {0}"
+msgstr "Змінити зв’язок {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeNodesCommand.java:51
+#, java-format
+msgid "Changed nodes of {0}"
+msgstr "Точки з {0} змінено"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:101
+#, java-format
+msgid "Remove \"{0}\" for node ''{1}''"
+msgstr "Вилучити \"{0}\" для точки ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
+#, java-format
+msgid "Remove \"{0}\" for way ''{1}''"
+msgstr "Вилучити \"{0}\" для лінії ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
+#, java-format
+msgid "Remove \"{0}\" for relation ''{1}''"
+msgstr "Вилучити \"{0}\" для зв’язку ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:108
+#, java-format
+msgid "Set {0}={1} for node ''{2}''"
+msgstr "Встановити {0}={1} для точки ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
+#, java-format
+msgid "Set {0}={1} for way ''{2}''"
+msgstr "Встановити {0}={1} для лінії ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
+#, java-format
+msgid "Set {0}={1} for relation ''{2}''"
+msgstr "Встановити {0}={1} для зв’язку ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:116
+#, java-format
+msgid "Remove \"{0}\" for {1} objects"
+msgstr "Вилучити \"{0}\" для {1} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
+#, java-format
+msgid "Set {0}={1} for {2} objects"
+msgstr "Встановити {0}={1} для {2} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
+#, java-format
+msgid "Change relation member role for {0} {1}"
+msgstr "Змінити роль члена зв’язку для {0} {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
+"conflict cannot be added.</html>"
+msgstr ""
+"<html>В шарі ''{0}'' вже присутній конфлікт для елемента<br>''{1}''."
+"<br>Неможливо додати цей конфлікт.</html>"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+msgid "Double conflict"
+msgstr "Подвійний конфлікт"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
+#, java-format
+msgid ""
+"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
+"primitive ''{1}''."
+msgstr ""
+"Попередження: Шар''{0}''більше не існує. Неможливо вилучити конфлікт для "
+"елемента ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
+#, java-format
+msgid "Add conflict for ''{0}''"
+msgstr "Додати конфлікт для ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:67
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:201
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
+#, java-format
+msgid ""
+"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr "Неможливо відмінити команду ''{0}'', так як відсутній шар ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
+#, java-format
+msgid "Resolve conflicts in coordinates in {0}"
+msgstr "Розв’язати конфлікт в позиції {0}"
+
+#. should not happen
+#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
+msgid "Cannot resolve undecided conflict."
+msgstr "Неможливо розв’язати невирішуваний конфлікт"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:66
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
+msgid "At least one object to delete required, got empty collection"
+msgstr "Потрібно вилучити, принаймні, один об'єкт, отримано порожній набір"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
+#, java-format
+msgid "Delete node {0}"
+msgstr "Вилучити точку {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:160
+#, java-format
+msgid "Delete way {0}"
+msgstr "Вилучити лінію {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
+#, java-format
+msgid "Delete relation {0}"
+msgstr "Вилучити зв’язок {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:175
+#, java-format
+msgid "Delete {0} object"
+msgid_plural "Delete {0} objects"
+msgstr[0] "Вилучити {0} об’єкт"
+msgstr[1] "Вилучити {0} об’єкти"
+msgstr[2] "Вилучити {0} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:180
+#, java-format
+msgid "Delete {0} node"
+msgid_plural "Delete {0} nodes"
+msgstr[0] "Вилучити {0} точку"
+msgstr[1] "Вилучити {0} точки"
+msgstr[2] "Вилучити {0} точок"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:181
+#, java-format
+msgid "Delete {0} way"
+msgid_plural "Delete {0} ways"
+msgstr[0] "Вилучити {0} лінію"
+msgstr[1] "Вилучити {0} лінії"
+msgstr[2] "Вилучити {0} ліній"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:182
+#, java-format
+msgid "Delete {0} relation"
+msgid_plural "Delete {0} relations"
+msgstr[0] "Вилучити {0} зв’язок"
+msgstr[1] "Вилучити {0} зв’язки"
+msgstr[2] "Вилучити {0} зв’язків"
+
+#. leave message in one tr() as there is a grammatical
+#. connection.
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:231
+msgid ""
+"You are about to delete nodes outside of the area you have downloaded."
+"<br>This can cause problems because other objects (that you do not see) "
+"might use them.<br>Do you really want to delete?"
+msgstr ""
+"Ви збираєтеся вилучити точки, що знаходяться за межами завантаженої ділянки."
+"<br>Це може викликати проблеми, тому що інші об'єкти (яких не видно) можуть "
+"використовувати їх.<br> Чи дійсно ви бажаєте вилучити ці точки?"
+
+#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:441
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:240
+msgid "Delete confirmation"
+msgstr "Підтвердження вилучення"
+
+#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46
+#, java-format
+msgid "Resolve conflicts in deleted state in {0}"
+msgstr "Розв’язати конфлікт у вилученому стані в {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41
+#, java-format
+msgid "Set the ''modified'' flag for node {0}"
+msgstr "Встановити прапор ''modified'' для точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
+#, java-format
+msgid "Set the ''modified'' flag for way {0}"
+msgstr "Встановити прапор ''modified'' для линії {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
+#, java-format
+msgid "Set the ''modified'' flag for relation {0}"
+msgstr "Встановити прапор ''modified'' для зв’язку {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
+#, java-format
+msgid "Move {0} node"
+msgid_plural "Move {0} nodes"
+msgstr[0] "Перемістити {0} точку"
+msgstr[1] "Перемістити {0} точки"
+msgstr[2] "Перемістити {0} точок"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:101
+#, java-format
+msgid "Purged object ''{0}''"
+msgstr "Очищений об’єкт ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:111
+#, java-format
+msgid "Purged {0} object"
+msgid_plural "Purged {0} objects"
+msgstr[0] "Очищено {0} об’єкт"
+msgstr[1] "Очищено {0} об’єкти"
+msgstr[2] "Очищено {0} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:152
+#, java-format
+msgid ""
+"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
+"{1}"
+msgstr ""
+"Увага: Очищення лінії {0}, тому що кількість точок стала менша 2. Поточне "
+"значення {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:161
+#, java-format
+msgid "Removing reference from relation {0}"
+msgstr "Вилучення посилання зі зв’язку {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57
+#, java-format
+msgid "Resolve conflicts in member list of relation {0}"
+msgstr "Розв’язання конфліктів серед членів зв’язку {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
+#, java-format
+msgid "Rotate {0} node"
+msgid_plural "Rotate {0} nodes"
+msgstr[0] "Обернути {0} точку"
+msgstr[1] "Обернути {0} точки"
+msgstr[2] "Обернути {0} точок"
+
+#: ../core/src/org/openstreetmap/josm/command/SequenceCommand.java:91
+msgid "Sequence"
+msgstr "Послідовність"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:67
+#, java-format
+msgid "Resolve {0} tag conflicts in node {1}"
+msgstr "Розв’язати {0} конфліктів теґів у точці {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:68
+#, java-format
+msgid "Resolve {0} tag conflicts in way {1}"
+msgstr "Розв’язати {0} конфліктів теґів у лінії {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:69
+#, java-format
+msgid "Resolve {0} tag conflicts in relation {1}"
+msgstr "Розв’язати {0} конфліктів теґів у зв’язку {1}"
+
+#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:68
+#, java-format
+msgid "Undelete {0} primitive"
+msgid_plural "Undelete {0} primitives"
+msgstr[0] "Відновити {0} елемент"
+msgstr[1] "Відновити {0} елементи"
+msgstr[2] "Відновити {0} елементів"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
+#, java-format
+msgid "Resolve version conflict for node {0}"
+msgstr "Розв’язати конфлікт версій для точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
+#, java-format
+msgid "Resolve version conflict for way {0}"
+msgstr "Розв’язати конфлікт версій для лінії {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
+#, java-format
+msgid "Resolve version conflict for relation {0}"
+msgstr "Розв’язати конфлікт версій для зв’язку {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53
+#, java-format
+msgid "Resolve conflicts in node list of way {0}"
+msgstr "Розв’язати конфлікт у переліку точок лінії {0}"
+
+#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71
+#, java-format
+msgid "Main dataset does not include node {0}"
+msgstr "Основний набір даних не містить точку {0}"
+
+#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
+msgid "Apply?"
+msgstr "Застосувати?"
+
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:199
+msgid ""
+"When reversing this way, the following changes to properties of the way and "
+"its nodes are suggested in order to maintain data consistency."
+msgstr ""
+"При зміні напрямку лінії, пропонується виправити наступні параметри для "
+"підтримки цілісності даних."
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
+msgid "Relation"
+msgstr "Зв'язок"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:28
+msgid "Old role"
+msgstr "Стара роль"
+
+#: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:30
+msgid "New role"
+msgstr "Нова роль"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:23
+msgid "Old key"
+msgstr "Старий ключ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+msgid "Old value"
+msgstr "Старе значення"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:27
+msgid "New key"
+msgstr "Новий ключ"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:29
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:231
+msgid "New value"
+msgstr "Нове значення"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:50
+msgid "Apply selected changes"
+msgstr "Застосувати позначені зміни"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:51
+msgid "Do not apply changes"
+msgstr "Не застосовувати зміни"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:74
+msgid "Please select which property changes you want to apply."
+msgstr "Будь ласка, позначте які зміни властивостей ви бажаєте застосувати."
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:86
+msgid "Properties of "
+msgstr "Властивості "
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:112
+msgid "Roles in relations referring to"
+msgstr "Ролі в зв’язках, що відносяться до"
+
+#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:133
+msgid "Automatic tag correction"
+msgstr "Автоматичне виправлення теґів"
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:75
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:79
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:81
+#, java-format
+msgid "Illegal latitude value ''{0}''"
+msgstr "Неправильне значення широти — ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Bounds.java:77
+#, java-format
+msgid "Illegal longitude value ''{0}''"
+msgstr "Неправильне значення довготи — ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
+#, java-format
+msgid "Warning: failed to persist preferences to ''{0}''"
+msgstr "Попередження: не зберігаються налаштування у ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
+#, java-format
+msgid "Malformed config file at lines {0}"
+msgstr "Файл налаштувань спотворено; рядок  {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
+"not a directory."
+msgstr ""
+"Попередження: Збій ініціалізації налаштувань. Каталог налаштувань ''{0}'' не "
+"є каталогом."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
+"not a directory.</html>"
+msgstr ""
+"<html>Збій ініціалізації налаштувань.<br>Каталог налаштувань ''{0}'' не є "
+"каталогом.</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences. Failed to create missing "
+"preference directory: {0}"
+msgstr ""
+"Попередження: Збій ініціалізації налаштувань. Не можливо створити відсутній "
+"каталог для налаштувань: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to create missing "
+"preference directory: {0}</html>"
+msgstr ""
+"<html>Збій ініціалізації налаштувань<br>Не можливо створити відсутній "
+"каталог для налаштувань: {0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
+#, java-format
+msgid ""
+"Warning: Missing preference file ''{0}''. Creating a default preference file."
+msgstr ""
+"Увага: Відсутній файл налаштувань ''{0}''. Створення типового файлу "
+"налаштувань."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
+#, java-format
+msgid ""
+"Warning: Replacing existing preference file ''{0}'' with default preference "
+"file."
+msgstr ""
+"Попередження: Існуючий файл налаштувань ''{0}'' буде замінений на файл з "
+"типовими налаштуваннями."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
+#, java-format
+msgid ""
+"<html>Failed to initialize preferences.<br>Failed to reset preference file "
+"to default: {0}</html>"
+msgstr ""
+"<html>Збій ініціалізації налаштувань<br>Не можливо замінити файл налаштувань "
+"на файл з типовими налаштуваннями: {0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
+#, java-format
+msgid ""
+"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
+"<br> and creating a new default preference file.</html>"
+msgstr ""
+"<html>Файл з налаштуваннями містить помилки.<br> Цей файл буде збережено як "
+"<br>{0}<br> та створено новий файл з типовими налаштуваннями.</html>"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
+#, java-format
+msgid ""
+"Warning: Failed to initialize preferences.Failed to reset preference file to "
+"default: {0}"
+msgstr ""
+"Попередження: Збій ініціалізації налаштувань. Неможливо замінити файл "
+"налаштувань {0} на файл з типовими налаштуваннями."
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
+msgstr "Помилка: Неочікуваний рядок ''{0}'' у файлі закладок ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr ""
+"Помилка: Невірне подвійне значення ''{0}'' у рядку ''{1}'' у файлі закладок "
+"''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
+#, java-format
+msgid "Preferences stored on {0}"
+msgstr "Налаштування збережені у {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
+#, java-format
+msgid "Could not upload preferences. Reason: {0}"
+msgstr "Неможливо відвантажити налаштування. Причина: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
+msgid "Could not load preferences from server."
+msgstr "Неможливо завантажити налаштування з сервера."
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
+#, java-format
+msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
+msgstr "Помилка: Неочікуванний рядок ''{0}'' у переліку закладок з сервера"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
+#, java-format
+msgid ""
+"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
+"server"
+msgstr ""
+"Помилка: Невірне подвійне значення ''{0}'' в рядку ''{1}'' в переліку "
+"закладок з сервера"
+
+#: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
+#, java-format
+msgid ""
+"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
+"{1}"
+msgstr ""
+"Збій завантаження закладок з ''{0}'' у зв’язку з проблемами безпеки. "
+"Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:47
+#, java-format
+msgid "Failed to load resource ''{0}'', error is {1}."
+msgstr "Збій завантаження ресурсу ''{0}'', помилка {1}."
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:98
+#: ../core/src/org/openstreetmap/josm/data/Version.java:161
+msgid "UNKNOWN"
+msgstr "НЕВІДОМО"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:112
+#, java-format
+msgid ""
+"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr ""
+"Попередження: несподіваний номер версії JOSM у файлі виправлень, "
+"значення:''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/data/Version.java:145
+msgid "Warning: the revision file ''/REVISION'' is missing."
+msgstr "Попередження: файл змін ''/ REVISION'' відсутній."
+
+#: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
+#, java-format
+msgid "Already registered a conflict for primitive ''{0}''."
+msgstr "Конфлікт вже зареєстровано для елемента ''{0}''"
+
+#. *
+#. * the decimal format 999.999
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:15
+msgid "Decimal Degrees"
+msgstr "Десяткові Градуси"
+
+#. *
+#. * the minutes/seconds format 99" 99'
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:20
+msgid "Degrees Minutes Seconds"
+msgstr "Градуси у Хвилинах Секундах"
+
+#. *
+#. * coordinates East/North
+#.
+#: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
+msgid "Projected Coordinates"
+msgstr "Прогнозовані Координати"
+
+#. short symbol for South
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:96
+msgctxt "compass"
+msgid "S"
+msgstr "Пд"
+
+#. short symbol for North
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:97
+msgctxt "compass"
+msgid "N"
+msgstr "Пн"
+
+#. short symbol for West
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:111
+msgctxt "compass"
+msgid "W"
+msgstr "Зх"
+
+#. short symbol for East
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:112
+msgctxt "compass"
+msgid "E"
+msgstr "Сх"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:216
+#, java-format
+msgid ""
+"Unable to add primitive {0} to the dataset because it is already included"
+msgstr "Неможливо додати елемент {0} до набору даних, так як він вже присутній"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:649
+#, java-format
+msgid ""
+"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
+"Please report this  at http://josm.openstreetmap.de . This is not a critical "
+"error, it should be safe to continue in your work."
+msgstr ""
+"JOSM очікував знайти елемент [{0} {1}] в наборі даних, але його там немає. "
+"Будь ласка, повідомте про це на http://josm.openstreetmap.de. Це не критична "
+"помилка, але необхідно зберегти дані, перш ніж продовжити роботу."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:109
+#, java-format
+msgid "Missing merge target for way with id {0}"
+msgstr "Відсутній результат об’єднання для лінії з ідентифікатором {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:169
+#, java-format
+msgid "Missing merge target for object with id {0}"
+msgstr "Відсутній результат об’єднання для об’єкта з ідентифікатором {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:201
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:115
+#, java-format
+msgid "Missing merge target for node with id {0}"
+msgstr "Відсутній результат об’єднання для точки з ідентифікатором {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:134
+#, java-format
+msgid "Missing merge target for relation with id {0}"
+msgstr "Відсутній результат об’єднання для зв’язку з ідентифікатором {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:221
+#: ../plugins/reverter/src/reverter/DataSetToCmd.java:139
+#, java-format
+msgid "Missing merge target of type {0} with id {1}"
+msgstr "Відсутній результат об’єднання для типу {0} з ідентифікатором {1}"
+
+#. should not happen
+#. FIXME: this message does not make sense, source version can not be lower than
+#. target version at this point
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:258
+#, java-format
+msgid ""
+"Target object with id {0} and version {1} is visible although source object "
+"with lower version {2} is not visible. Cannot deal with this inconsistency. "
+"Keeping target object. "
+msgstr ""
+"Отриманий об’єкт з ідентифікатором {0} та версією {1} видимий, хоча "
+"первинний об’єкт з нижчою версією {2} не видимий. Ця невідповідність "
+"неможлива. Отриманий об’єкт збережено. "
+
+#. translators notes must be in front
+#. column header: enable filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:166
+msgctxt "filter"
+msgid "E"
+msgstr "Вкл."
+
+#. column header: hide filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:167
+msgctxt "filter"
+msgid "H"
+msgstr "Викл."
+
+#. column header: filter text
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:168
+msgctxt "filter"
+msgid "Text"
+msgstr "Текст"
+
+#. column header: apply filter for children
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:169
+msgctxt "filter"
+msgid "C"
+msgstr ""
+
+#. column header: inverted filter
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:170
+msgctxt "filter"
+msgid "I"
+msgstr "I"
+
+#. column header: filter mode
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:171
+msgctxt "filter"
+msgid "M"
+msgstr "M"
+
+#. translators notes must be in front
+#. filter mode: replace
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:239
+msgctxt "filter"
+msgid "R"
+msgstr "Замін."
+
+#. filter mode: add
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:240
+msgctxt "filter"
+msgid "A"
+msgstr "Додати"
+
+#. filter mode: remove
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:241
+msgctxt "filter"
+msgid "D"
+msgstr "Вилучити"
+
+#. filter mode: in selection
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:242
+msgctxt "filter"
+msgid "F"
+msgstr "З"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:269
+msgid "<h2>Filter active</h2>"
+msgstr "<h2>Фільтр активний</h2>"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:275
+#, java-format
+msgid "<p><b>{0}</b> objects hidden"
+msgstr "<p><b>{0}</b> об’єктів приховано"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:283
+#, java-format
+msgid "<b>{0}</b> objects disabled"
+msgstr "<b>{0}</b> об’єктів пошкоджено"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:286
+msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
+msgstr "</p><p>Закрити діалог фільтра, щоб побачити всі об'єкти.<p></html>"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:488
+msgid "A primitive with ID = 0 cannot be invisible."
+msgstr "Елемент з ідентифікатором =0 не може бути видимий."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:545
+#, java-format
+msgid "ID > 0 expected. Got {0}."
+msgstr "Очікується ідентифікатор >0. Маємо {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:547
+#, java-format
+msgid "Version > 0 expected. Got {0}."
+msgstr "Очікується версія >0. Маємо {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:767
+#, java-format
+msgid ""
+"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
+"{0}"
+msgstr ""
+"Неможливо призначити changesetId> 0 новому елементу. Значення changesetId — "
+"{0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1139
+msgid ""
+"Cannot merge because either of the participating primitives is new and the "
+"other is not"
+msgstr "Об’єднання неможливе, тому що частина елементів нові, а частина ні"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1141
+#, java-format
+msgid ""
+"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
+msgstr ""
+"Неможливе об’єднання елементів із різними ідентифікаторами. Цей "
+"ідентифікатор — {0}, інший — {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:108
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
+msgid "node"
+msgid_plural "nodes"
+msgstr[0] "точка"
+msgstr[1] "точки"
+msgstr[2] "точок"
+
+#. light cyan
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:11
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:18
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
+msgid "way"
+msgid_plural "ways"
+msgstr[0] "лінія"
+msgstr[1] "лінії"
+msgstr[2] "ліній"
+
+#. dark blue
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:12
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:19
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:170
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:364
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
+msgid "relation"
+msgid_plural "relations"
+msgstr[0] "зв’язок"
+msgstr[1] "зв’язки"
+msgstr[2] "зв’зяків"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:587
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:608
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:625
+#: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:643
+msgid ""
+"Tag collection cannot be applied to a primitive because there are keys with "
+"multiple values."
+msgstr ""
+"Набір теґів не може бути застосований до елемента, тому що є ключі з "
+"кількома значеннями."
+
+#: ../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}."
+msgstr "Неможливо додати точку {0} до неповної лінії {1}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
+#, java-format
+msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
+msgstr "Неможливо порівняти елементи з ідентифікаторами ''{0}'' та ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
+#, java-format
+msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
+msgstr "Параментр {0} не в діапазоні 0..{1}, його значення {2}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:188
+msgid "Area style way is not closed."
+msgstr "Лінія, що показує межу ділянки, не замкнена."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:267
+msgid "More than one \"from\" way found."
+msgstr "Виявлено більше ніж одну лінію \"від\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:273
+msgid "More than one \"to\" way found."
+msgstr "Виявлено більше ніж одну лінію \"до\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:279
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:293
+msgid "More than one \"via\" found."
+msgstr "Виявлено більше ніж одну лінію, що проходить \"крізь\"."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:284
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:298
+#, java-format
+msgid "Unknown role ''{0}''."
+msgstr "Невідома роль ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:301
+#, java-format
+msgid "Unknown member type for ''{0}''."
+msgstr "Невідомий тип члегна ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:307
+msgid "No \"from\" way found."
+msgstr "Лінію «від» не знайдено."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:311
+msgid "No \"to\" way found."
+msgstr "Лінію «до» не знайдено."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:315
+msgid "No \"via\" node or way found."
+msgstr "Не знайдено точки чи ліню що проходить «крізь»"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:324
+msgid "The \"from\" way does not start or end at a \"via\" node."
+msgstr "Лінія «від» не починається/закінчується у точці «крізь»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:328
+msgid "The \"to\" way does not start or end at a \"via\" node."
+msgstr "Лінія «до» не починається/закінчується у точці «крізь»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:359
+msgid "The \"from\" way does not start or end at the \"via\" way."
+msgstr "Лінія «від» не починається/закінчується на лінії «крізь»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:363
+msgid "The \"to\" way does not start or end at the \"via\" way."
+msgstr "Лінія «до» не починається/закінчується на лінії «крізь»."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:457
+#, java-format
+msgid "Style for restriction {0} not found."
+msgstr "Стиль для обмеження {0} не знайдено."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:529
+#, java-format
+msgid "Style for inner way ''{0}'' equals multipolygon."
+msgstr "Стиль внутрішньої лінії \"{0}\" такий же, як у мультиполігону."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:557
+#, java-format
+msgid "Style for outer way ''{0}'' mismatches."
+msgstr "Стиль зовнішньої лінії \"{0}\" не узгоджений."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:755
+#, java-format
+msgid "Error: {0}"
+msgstr "Помилка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:755
+#, java-format
+msgid "Warning: {0}"
+msgstr "Попередження: {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:13
+msgid "inactive"
+msgstr "неактивний"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
+msgid "selected"
+msgstr "виділено"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
+msgid "Node: standard"
+msgstr "Точка: стандартна"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
+msgid "Node: connection"
+msgstr "Точка: з’єднання"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
+msgid "Node: tagged"
+msgstr "Точка: з теґом"
+
+#. teal
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
+msgid "untagged way"
+msgstr "лінія без теґів"
+
+#. dark green
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:21
+msgid "incomplete way"
+msgstr "незакінчена лінія"
+
+#. darker blue
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
+msgid "background"
+msgstr "тло"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:23
+msgid "highlight"
+msgstr "підсвічування"
+
+#. lighteal
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25
+msgid "untagged"
+msgstr "без теґів"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:26
+msgid "text"
+msgstr "текст"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:27
+msgid "areatext"
+msgstr "текст"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
+msgid "WGS84 Geographic"
+msgstr "Географічна WGS84"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:100
+#, java-format
+msgid ""
+"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
+"NTF<->RGF93 grid"
+msgstr ""
+"Попередження: не вдалося відкрити вхідний потік для ресурсу ''/data/{0}''. "
+"Неможливо завантажити решітку NTF <-> RGF93"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
+msgid "Lambert 4 Zones (France)"
+msgstr "Зона Lambert 4 (Франція)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:249
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:250
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:251
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:177
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:178
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:179
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:180
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:181
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:182
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:183
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:184
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:185
+#, java-format
+msgid "{0} ({1} to {2} degrees)"
+msgstr "{0} ({1} на {2} град.)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
+#, java-format
+msgid "{0} (Corsica)"
+msgstr "{0} (Корсика)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
+msgid "Lambert CC Zone"
+msgstr "Зона Lambert CC"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133
+msgid "Lambert CC9 Zone (France)"
+msgstr "Зона Lambert CC9 (Франція)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
+msgid "Lambert Zone (Estonia)"
+msgstr "Lambert-зона (Естонія)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
+msgid "Mercator"
+msgstr "Проекція Меркатора"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
+msgid "PUWG (Poland)"
+msgstr "PUWG (Польща)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:106
+msgid "PUWG Zone"
+msgstr "Зона PUWG"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
+msgid "PUWG 1992 (Poland)"
+msgstr "PUWG 1992 (Польща))"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
+#, java-format
+msgid "PUWG 2000 Zone {0} (Poland)"
+msgstr "Зона PUWG 2000 {0} (Польща)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
+msgid "Swiss Grid (Switzerland)"
+msgstr "Швейцарська проекція"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
+msgid "UTM"
+msgstr "UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
+msgid "UTM Zone"
+msgstr "Зона UTM"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:25
+msgid "Guadeloupe Fort-Marigot 1949"
+msgstr "Форт Marigot Гваделупа 1949"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:26
+msgid "Guadeloupe Ste-Anne 1948"
+msgstr "Гваделупа Sainte Anne 1948"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:27
+msgid "Martinique Fort Desaix 1952"
+msgstr "Мартиніка Форт Desaix 1952"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:28
+msgid "Reunion RGR92"
+msgstr "Reunion RGR92"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:410
+msgid "UTM 20N (France)"
+msgstr "UTM 20N (Франція)"
+
+#: ../core/src/org/openstreetmap/josm/data/projection/UTM_France_DOM.java:422
+msgid "UTM20 North Geodesic system"
+msgstr "Північна геодезична система UTM20"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
+#, java-format
+msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
+msgstr "<html>Неможливо прочитати закладки з<br>''{0}''<br>Помилка: {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
+#, java-format
+msgid "<html>Could not write bookmark.<br>{0}</html>"
+msgstr "<html>Неможливо створити закладку.<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:201
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
+msgid "Do not show again (remembers choice)"
+msgstr "Не показувати знову (запам'ятати вибір)"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:84
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:86
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:285
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
+#, java-format
+msgid " [id: {0}]"
+msgstr " [id: {0}]"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:100
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:125
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:217
+msgid "incomplete"
+msgstr "неповний елемент"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
+msgid "highway"
+msgstr "дорога"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
+#: build/trans_presets.java:3214
+msgid "railway"
+msgstr "залізниця"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:139
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:341
+msgid "waterway"
+msgstr "водний шлях"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:140
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:342
+msgid "landuse"
+msgstr "землекористування"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:147
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:347
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
+#, java-format
+msgid "{0} node"
+msgid_plural "{0} nodes"
+msgstr[0] "{0} точка"
+msgstr[1] "{0} точки"
+msgstr[2] "{0} точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+msgid "public transport"
+msgstr "громадський транспорт"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:207
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:392
+#, java-format
+msgid "{0} member"
+msgid_plural "{0} members"
+msgstr[0] "{0} член"
+msgstr[1] "{0} члени"
+msgstr[2] "{0} членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:233
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
+#, java-format
+msgid "Changeset {0}"
+msgstr "Набір змін {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:76
+msgid "Precondition violation"
+msgstr "Порушення передумов"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:104
+msgid "Security exception"
+msgstr "Виключення системи безпеки"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:122
+msgid "Network exception"
+msgstr "Виключення мережі"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:140
+msgid "IO Exception"
+msgstr "Виключення вводу-виводу"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:157
+msgid "Illegal Data"
+msgstr "Невірні дані"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:190
+msgid "Internal Server Error"
+msgstr "Внутрішня помилка сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:206
+msgid "Bad Request"
+msgstr "Некоректний запит"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:222
+msgid "Not Found"
+msgstr "Не знайдено"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
+msgid "Conflict"
+msgstr "Конфлікт"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:261
+msgid "Authentication Failed"
+msgstr "Збій автентифікації"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:277
+msgid "Authorisation Failed"
+msgstr "Збій авторизації"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:293
+msgid "Client Time Out"
+msgstr "Час очікування клієнта вичерпаний"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:309
+msgid "Communication with OSM server failed"
+msgstr "Збій з’єднання з сервером OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:325
+msgid "Authentication failed"
+msgstr "Збій автентифікації"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:343
+msgid "Unknown host"
+msgstr "Невідомий вузол"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:461
+msgid "Object deleted"
+msgstr "Об'єкт вилучено"
+
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:208
+#: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
+msgid "Show help information"
+msgstr "Показати довідкову інформацію"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:70
+msgid "Message of the day not available"
+msgstr "Повідомлення дня недоступне"
+
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:104
+msgid "Downloading \"Message of the day\""
+msgstr "Завантаження «Повідомлення дня»"
+
+#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
+msgid "Click to close the dialog"
+msgstr "Натисніть, щоб закрити діалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:104
+#, java-format
+msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
+msgstr "Очікувалось непорожнє значення для параметру ''{0}'', отримано ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
+msgid "Upload Preferences"
+msgstr "Надіслати налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+msgid "Upload the current preferences to the server"
+msgstr "Надсилання поточних налаштувань на сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+msgid "string"
+msgstr "рядок"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+msgid "Name of the user."
+msgstr "Ім’я користувача."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+msgid "OSM Password."
+msgstr "OSM Пароль."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
+msgstr "Змінення розміру аплету до заданих розмірів (формат: ШИРИНАхВИСОТА)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+msgid "string;string;..."
+msgstr "рядок;рядок;…"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+msgid ""
+"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
+"filename"
+msgstr ""
+"Завантажувати кожний елемент. Повинно бути x1,y1,x2,y2 у посиланні "
+"lat=y&lon=x&zoom=z або ім’я файлу"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+msgid ""
+"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
+"lat=y&lon=x&zoom=z or a filename"
+msgstr ""
+"Завантажувати кожний елемент, як дані gps. Повинно бути x1,y1,x2,y2 у "
+"посиланні lat=y&lon=x&zoom=z або ім’я файлу"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
+msgid ""
+"Add each to the initial selection. Can be a google-like search string or an "
+"URL which returns osm-xml"
+msgstr ""
+"Додавати кожний елемент до початкового вибору. Повинно буди схожим на "
+"посилання google або на посилання, яке надає osm-xml"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
+msgid "any"
+msgstr "довільний"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
+msgid "If specified, reset the configuration instead of reading it."
+msgstr ""
+"якщо встановлено, перевстановити на типові налаштування замість їх "
+"зчитування."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
+msgid "Username"
+msgstr "Логін"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
+msgid "Password"
+msgstr "Пароль"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+msgid "usage"
+msgstr "використання"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+msgid "options"
+msgstr "параметри"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+msgid "Show this help"
+msgstr "Показати цю довідку"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+msgid "Standard unix geometry argument"
+msgstr "Стандартний аргумент геометрії unix"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+msgid "Download the bounding box"
+msgstr "Завантажити ділянку в межах габаритного прямокутника"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
+msgstr ""
+"Завантажити місцевість за посиланням (з параметрами lat=x&lon=y&zoom=z)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+msgid "Open a file (any file type that can be opened with File/Open)"
+msgstr ""
+"Відкрити файл (будь-який тип файлів, який можна відкрити за допомогою меню "
+"Файл/Відкрити)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+msgid "Download the bounding box as raw gps"
+msgstr "Завантажити ділянку в межах габаритного прямокутника, як дані GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
+msgstr ""
+"Завантажити місцевість за посиланням (з параметрами lat=x&lon=y&zoom=z), як "
+"дані GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+msgid "Select with the given search"
+msgstr "Вибір з урахуванням пошуку"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+msgid "Launch in maximized mode"
+msgstr "Запуск у розгорнутому вигляді"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
+msgid "Reset the preferences to default"
+msgstr "Відновити типові налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
+msgid "Set the language"
+msgstr "Встановити мову"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+msgid "options provided as Java system properties"
+msgstr "системні налаштування Java"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+msgid "/PATH/TO/JOSM/FOLDER/         "
+msgstr "ШЛЯХ/ДО/ПАПКИ/JOSM/         "
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
+msgid "Change the folder for all user settings"
+msgstr "Зміна папки для всіх налаштувань користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
+msgid ""
+"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
+"the following\n"
+"      Java option to specify the maximum size of allocated memory in "
+"megabytes"
+msgstr ""
+"Примітка: Для деяких завдань, JOSM вимагає багато пам'яті. Може бути "
+"необхідно додати наступний\n"
+"          параметр Java, щоб вказати в мегабайтах максимальний розмір "
+"виділеної пам'яті"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
+msgid "examples"
+msgstr "приклади"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
+msgid ""
+"Parameters --download, --downloadgps, and --selection are processed in this "
+"order."
+msgstr ""
+"Параметри --download, --downloadgps і --selection обробляються в цьому "
+"порядку."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
+msgid "Make sure you load some data if you use --selection."
+msgstr ""
+"Переконайтеся, що ви завантажили хоч якісь дані, якщо ви використовуєте --"
+"selection."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
+msgid "Initializing"
+msgstr "Ініціалізація"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
+msgid "Updating plugins..."
+msgstr "Оновлення втулків…"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
+msgid "Installing updated plugins"
+msgstr "Встановлення оновлених втулків"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
+msgid "Loading early plugins"
+msgstr "Завантаження ранніх втулків"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
+msgid "Setting defaults"
+msgstr "Типові налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
+msgid "Creating main GUI"
+msgstr "Створення головного вікна"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
+msgid "Loading plugins"
+msgstr "Завантаження втулків"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
+#, java-format
+msgid "Preference setting {0} has been removed since it is no longer used."
+msgstr ""
+"Параметр налаштувань {0} був вилучений, так як він більше не "
+"використовується."
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166
+msgid "File"
+msgstr "Файл"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:484
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:658
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:219
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:650
+msgid "Edit"
+msgstr "Правка"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:168
+msgid "View"
+msgstr "Вигляд"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:169
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:27
+#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:26
+msgid "Tools"
+msgstr "Інструменти"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:170
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:191
+msgid "Presets"
+msgstr "Заготовки"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:195
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
+#: ../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
+msgid "Menu: {0}"
+msgstr "Меню: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:304
+msgid "Audio"
+msgstr "Звук"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+msgid "Move right"
+msgstr "Пересунути праворуч"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
+#, java-format
+msgid "Map: {0}"
+msgstr "Мапа: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:92
+msgid "Move left"
+msgstr "Пересунути ліворуч"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:97
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:193
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:202
+msgid "Move up"
+msgstr "Пересунути вгору"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:102
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:166
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:176
+msgid "Move down"
+msgstr "Пересунути вниз"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:107
+msgid "Zoom in"
+msgstr "Наблизити"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapMover.java:112
+msgid "Zoom out"
+msgstr "Віддалити"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapScaler.java:41
+msgid "scale"
+msgstr "масштаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+msgid "The geographic longitude at the mouse pointer."
+msgstr "Географічна довгота під вказівником миші"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+msgid "The name of the object at the mouse pointer."
+msgstr "Назва об’єкту під вказівником миші"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+msgid "The geographic latitude at the mouse pointer."
+msgstr "Географічна широта під вказівником миші"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+msgid "The angle between the previous and the current way segment."
+msgstr "Кут між попереднім і поточним відрізком лінії."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+msgid "The (compass) heading of the line segment being drawn."
+msgstr "Подорожній кут створюваного відрізку лінії"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+msgid "The length of the new way segment being drawn."
+msgstr "Довжина створюваного відрізку лінії"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+"Натисніть на середню клавішу ще раз, щоб активувати на наступний елемент."
+"<br> Утримуйте CTRL, щоб вибрати мишею, безпосередньо зі списку.<hr>"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
+msgid "(no object)"
+msgstr "(Немає об'єкта)"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
+msgid "User:"
+msgstr "Користувач:"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
+msgid "Layer not in list."
+msgstr "Шару немає в списку."
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
+#, java-format
+msgid "Layer ''{0}'' must be in list of layers"
+msgstr "Шар ''{0}'' повинен бути в списку шарів"
+
+#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
+msgid "Click to cancel the current operation"
+msgstr "Клацніть, щоб скасувати поточну операцію"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
+msgid "false: the property is explicitly switched off"
+msgstr "хибність: параметр явно вимкнено"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:91
+msgid "true: the property is explicitly switched on"
+msgstr "істина: параметр явно увімкнено"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
+msgid ""
+"partial: different selected objects have different values, do not change"
+msgstr "частково: різні обрані об’єкти мають відмінні значення; не змінюйте"
+
+#: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
+msgid "unset: do not set this property on the selected objects"
+msgstr "обнулити: не встановлювати цей параметр для обраних об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150
+msgid ""
+"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
+"relation</strong>.</html>"
+msgstr ""
+"<html>Будь ласка, підтвердить вилучення <strong>1 об’єкта</strong> з "
+"<strong>1 зв’язку</strong>.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154
+#, java-format
+msgid ""
+"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
+"relations</strong>.</html>"
+msgstr ""
+"<html>Будь ласка, підтвердить вилучення <strong>1 об’єкта</strong> з <strong>"
+"{0} зв’язків</strong>.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
+#, java-format
+msgid ""
+"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
+"relations</strong>.</html>"
+msgstr ""
+"<html>Будь ласка, підтвердить вилучення<strong>{0} об’єктів</strong> із "
+"<strong>{1} зв’язків</strong>.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165
+#, java-format
+msgid "Deleting {0} object"
+msgid_plural "Deleting {0} objects"
+msgstr[0] "Вилучення {0} об’єкта"
+msgstr[1] "Вилучення {0} об’єктів"
+msgstr[2] "Вилучення {0} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167
+msgid "Delete objects"
+msgstr "Вилучити об'єкти"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
+msgid "To delete"
+msgstr "Вилучити"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319
+msgid "From Relation"
+msgstr "Зі зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
+msgid "Pos."
+msgstr "Поз."
+
+#. the role column
+#: ../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/properties/PropertiesDialog.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:18
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:20
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java:20
+msgid "Role"
+msgstr "Роль"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352
+msgid "Click to close the dialog and remove the object from the relations"
+msgstr "Клацніть, щоб закрити діалог і вилучити об'єкт зі зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365
+msgid "Click to close the dialog and to abort deleting the objects"
+msgstr "Клацніть, щоб закрити діалог і скасувати вилучення об'єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
+msgid ""
+"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
+"level.</html>"
+msgstr ""
+"<html>Будь ласка, виберіть <strong>діапазон квадратів OSM</strong> на даному "
+"рівні масштабування.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
+msgid "Zoom level:"
+msgstr "Масштаб:"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
+msgid "from tile"
+msgstr "з квадрата"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
+msgid "up to tile"
+msgstr "до квадрата"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
+msgid ""
+"<html>Alternatively you may enter a <strong>tile address</strong> for a "
+"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
+"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
+"html>"
+msgstr ""
+"<html>Як альтернативу, ви можете ввести <strong>адресу квадрата</strong> для "
+"окремого квадрата у форматі <i>zoomlevel/x/y</i>, наприклад: <i>15/256/223</"
+"i>. Адреси квадратів в форматі <i>zoom,x,y</i> або <i>zoom;x;y</i> також "
+"вірні.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
+msgid "Tile address:"
+msgstr "Адреса квадрату:"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:502
+msgid "Apply the tile address"
+msgstr "Застосувати адресу квадрату"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:561
+msgid "Please enter a tile address"
+msgstr "Будь ласка, введіть адресу квадрату"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:563
+msgid "The current value isn''t a valid tile address"
+msgstr "Поточне значення не є правильною адресою"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:609
+msgid "Please enter a tile index"
+msgstr "Будь ласка, введіть індекс квадрату"
+
+#: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:611
+msgid "The current value isn''t a valid tile index for the given zoom level"
+msgstr ""
+"Поточне значення не є правильним індексом для цього рівня масштабування"
+
+#. *
+#. * compare my version of an {@see OsmPrimitive} with their version
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:17
+msgid "My with Their"
+msgstr "Мою з чужою"
+
+#. *
+#. * compare my version of an {@see OsmPrimitive} with the merged version
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:22
+msgid "My with Merged"
+msgstr "Мою із об’єднаною"
+
+#. *
+#. * compare their version of an {@see OsmPrimitive} with the merged veresion
+#.
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:27
+msgid "Their with Merged"
+msgstr "Їх з об’єднаною"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java:82
+#, java-format
+msgid "Role {0} is not participating in compare pair {1}."
+msgstr "Роль {0} не приймає участь у парі порівняння {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
+msgid "Properties"
+msgstr "Властивості"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:234
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:424
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:192
+msgid "Tags"
+msgstr "Теґи"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
+msgid "Nodes"
+msgstr "Точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
+msgid "Members"
+msgstr "Члени"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
+msgid "No pending tag conflicts to be resolved"
+msgstr "Конфлікти теґів, що очікують розв’язання — відсутні"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
+#, java-format
+msgid "Tags({0} conflict)"
+msgid_plural "Tags({0} conflicts)"
+msgstr[0] "Теґи ({0} конфлікт)"
+msgstr[1] "Теґи ({0} конфлікти)"
+msgstr[2] "Теґи ({0} конфліктів)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
+#, java-format
+msgid "{0} pending tag conflict to be resolved"
+msgid_plural "{0} pending tag conflicts to be resolved"
+msgstr[0] "Треба розв’язати {0} конфлікт теґів"
+msgstr[1] "Треба розв’язати {0} конфлікти теґів"
+msgstr[2] "Треба розв’язати {0} конфліктів теґів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
+msgid "Nodes(resolved)"
+msgstr "Точки (без конфліктів)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
+msgid ""
+"Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr ""
+"Список з’єднаних точок заморожений. Конфліктів, що очікують на розв’язання "
+"для цієї ліні — немає"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
+msgid "Nodes(with conflicts)"
+msgstr "Точки (з конфліктами)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
+msgid "Pending conflicts in the node list of this way"
+msgstr "Не розв’язані конфлікти в списку точок цієї лінії"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
+msgid "Members(resolved)"
+msgstr "Члени (без конфліктів)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
+msgid ""
+"Merged member list frozen. No pending conflicts in the member list of this "
+"relation"
+msgstr ""
+"Об'єднаний список членів  заморожений. Конфлікти, що очікують на розв’язання "
+"у списку членів цього зв’язку — відсутні"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
+msgid "Members(with conflicts)"
+msgstr "Члени (з конфліктами)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
+msgid "Pending conflicts in the member list of this relation"
+msgstr "Не розв’язані конфлікти в списку членів цього зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
+msgid "No pending property conflicts"
+msgstr "Не розв’язані конфлікти властивостей відсутні"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
+msgid "Properties(with conflicts)"
+msgstr "Властивості ( з конфліктами)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
+msgid "Pending property conflicts to be resolved"
+msgstr "Конфлікти властивостей, що очікують розв’язання"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
+msgid "Conflict Resolution"
+msgstr "Розв'язання конфліктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:321
+#, java-format
+msgid "{0} more..."
+msgstr "Ще {0} …"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
+msgid ""
+"The following primitives could not be copied to the target "
+"primitive<br>because they are deleted in the target dataset:"
+msgstr ""
+"Наступні елементи не можливо скопіювати у вказаний елемент,<br> тому що вони "
+"вилучені із набору даних вказаного елемента:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
+msgid "Merging deleted primitives failed"
+msgstr "Збій під час об’єднання вилучених елеменів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:628
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:652
+#, java-format
+msgid "List in role {0} is currently not participating in a compare pair."
+msgstr "Список в ролі {0} в даний момент не бере участь у парі порівняння ."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:801
+#, java-format
+msgid "Unexpected value of parameter ''index''. Got {0}."
+msgstr "Неочікуванне значення параметра \"index\". Почточне значення {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:815
+#, java-format
+msgid "Item {0} not found in list."
+msgstr "Елемент {0} в списку відсутній."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:237
+msgid "lock scrolling"
+msgstr "Блокування прокрутки"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:245
+msgid "Compare "
+msgstr "Порівняти "
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
+msgid "My version"
+msgstr "Моя версія"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:281
+msgid "List of elements in my dataset, i.e. the local dataset"
+msgstr "Список елементів в моєму наборі даних, тобто локальному наборі даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
+msgid "Merged version"
+msgstr "Об'єднана версія"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287
+msgid ""
+"List of merged elements. They will replace the my elements when the merge "
+"decisions are applied."
+msgstr ""
+"Список об'єднаних елементів. Вони замінять Мої елементи коли рішення про "
+"об'єднання буде прийнято."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
+msgid "Their version"
+msgstr "Їх версія"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293
+msgid "List of elements in their dataset, i.e. the server dataset"
+msgstr "Список елементів в чужому наборі даних, набір даних на сервері"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425
+msgid "> top"
+msgstr "> вгору"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:427
+msgid "Copy my selected nodes to the start of the merged node list"
+msgstr "Копіювати мої виділені точки в початок списку об'єднаних точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:452
+msgid "> bottom"
+msgstr "> вниз"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454
+msgid "Copy my selected elements to the end of the list of merged elements."
+msgstr "Копіювати мої виділені елементи в кінець списку об'єднаних елементів."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481
+msgid ""
+"Copy my selected elements before the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Копіювати мої виділені елементи перед першим виділеним елементом у списку "
+"об'єднаних елементів."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515
+msgid ""
+"Copy my selected elements after the first selected element in the list of "
+"merged elements."
+msgstr ""
+"Копіювати мої виділені елементи після першого виділеного елемента в списку "
+"об'єднаних елементів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544
+msgid ""
+"Copy their selected element to the start of the list of merged elements."
+msgstr ""
+"Скопіювати чужі виділені елементи в початок списку об'єднаних елементів."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
+msgid "Copy their selected elements to the end of the list of merged elements."
+msgstr ""
+"Скопіювати чужі виділені елементи в кінець списку об'єднаних елементів."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588
+msgid ""
+"Copy their selected elements before the first selected element in the list "
+"of merged elements."
+msgstr ""
+"Скопіювати чужі виділені елементи перед першим виділеним елементом у списку "
+"об'єднаних елементів."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:617
+msgid ""
+"Copy their selected element after the first selected element in the list of "
+"merged elements"
+msgstr ""
+"Скопіювати чужі виділені елементи після першого виділеного елемента в списку "
+"об'єднаних елементів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643
+msgid "Copy all my elements to the target"
+msgstr "Копіювати всі мої елементи в місце призначення"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669
+msgid "Copy all their elements to the target"
+msgstr "Копіювати всі чужі елементи в місце призначення"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+msgid "Up"
+msgstr "Вгору"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698
+msgid "Move up the selected elements by one position."
+msgstr "Підняти виділені елементи на одну позицію."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+msgid "Down"
+msgstr "Вниз"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:730
+msgid "Move down the selected entries by one position."
+msgstr "Опустити виділені елементи на одну позицію."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:154
+msgid "Remove"
+msgstr "Вилучити"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:762
+msgid "Remove the selected entries from the list of merged elements."
+msgstr "Вилучити виділені записи зі списку об'єднаних елементів."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:791
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:828
+msgid "Freeze"
+msgstr "Заморозити"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:792
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:829
+msgid "Freeze the current list of merged elements."
+msgstr "Заморозити поточний список об'єднаних елементів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:824
+msgid "Unfreeze"
+msgstr "Розблокувати"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:825
+msgid "Unfreeze the list of merged elements and start merging."
+msgstr "Розблокувати список об'єднаних елементів і почати об'єднання"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:850
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
+"html>"
+msgstr ""
+"<html>Натисніть<strong>{0}</strong>, щоб почати об'єднання моїх записів з "
+"чужими</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855
+#, java-format
+msgid ""
+"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
+"html>"
+msgstr ""
+"<html>Натисніть<strong>{0}</strong>, щоб закінчити об'єднання моїх записів з "
+"чужими</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
+#, java-format
+msgid "My version ({0} entry)"
+msgid_plural "My version ({0} entries)"
+msgstr[0] "Моя версія ({0} запис)"
+msgstr[1] "Моя версія ({0} записи)"
+msgstr[2] "Моя версія ({0} записів)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:876
+#, java-format
+msgid "Merged version ({0} entry)"
+msgid_plural "Merged version ({0} entries)"
+msgstr[0] "Об'єднана версія ({0} запис)"
+msgstr[1] "Об'єднана версія ({0} записи)"
+msgstr[2] "Об'єднана версія ({0} записів)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:879
+#, java-format
+msgid "Their version ({0} entry)"
+msgid_plural "Their version ({0} entries)"
+msgstr[0] "Чужа версія ({0} запис)"
+msgstr[1] "Чужа версія ({0} записи)"
+msgstr[2] "Чужа версія ({0} записів)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:942
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
+#, java-format
+msgid ""
+"Adjustable {0} not registered yet. Cannot set participation in synchronized "
+"adjustment."
+msgstr ""
+"Регульований {0} ще не зареєстрований. Неможливо встановити участь у "
+"синхронізованих регулюваннях."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957
+#: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:94
+#, java-format
+msgid "Adjustable {0} not registered yet."
+msgstr "Регульований {0} ще не зареєстровано"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
+msgid "Node"
+msgstr "Точка"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
+msgid "Merged nodes not frozen yet. Cannot build resolution command."
+msgstr ""
+"Об'єднані точки ще не заморожені. Неможливо побудувати команду розв’язання "
+"конфліктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
+#, java-format
+msgid ""
+"<html>An error occurred while communicating with the server<br>Details: {0}</"
+"html>"
+msgstr ""
+"<html>Під час з’єднання з сервером виникла помилка<br>Подробиці: {0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
+msgid "Communication with server failed"
+msgstr "Збій під час з’єднання з сервером"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
+msgid "Yes, undelete them too"
+msgstr "Так, відновити їх теж"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
+msgid "No, cancel operation"
+msgstr "Ні, відмінити дію"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515
+#, java-format
+msgid ""
+"There is {0} additional node used by way {1}<br>which is deleted on the "
+"server.<br><br>Do you want to undelete this node too?"
+msgid_plural ""
+"There are {0} additional nodes used by way {1}<br>which are deleted on the "
+"server.<br><br>Do you want to undelete these nodes too?"
+msgstr[0] ""
+"Є {0} додаткова точка, що використовується в лінії {1}<br>, яку вилучено на "
+"сервері.<br><br>Ви бажаєте відновити цю точку також?"
+msgstr[1] ""
+"Є {0} додаткові точки, що використовуються в лінії {1}<br>, які вилучено на "
+"сервері.<br><br>Ви бажаєте відновити ці точки також?"
+msgstr[2] ""
+"Є {0} додаткових точок, що використовуються в лінії {1}<br>, які вилучено на "
+"сервері.<br><br>Ви бажаєте відновити ці точки також?"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
+msgid "Undelete additional nodes?"
+msgstr "Відновити додаткові точки?"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549
+#, java-format
+msgid ""
+"There is {0} additional primitive referred to by relation {1}<br>which is "
+"deleted on the server.<br><br>Do you want to undelete this too?"
+msgid_plural ""
+"There are {0} additional primitives referred to by relation {1}<br>which are "
+"deleted on the server.<br><br>Do you want to undelete these too?"
+msgstr[0] ""
+"Є {0} додатковий елемент, що входить до зв’язку {1}<br>, який вилучено на "
+"сервері.<br><br>Ви бажаєте відновити його також?"
+msgstr[1] ""
+"Є {0} додаткових елементи, що входять до зв’язку {1}<br>, який вилучено на "
+"сервері.<br><br>Ви бажаєте відновити їх також?"
+msgstr[2] ""
+"Є {0} додаткових елементів, що входять до зв’язку {1}<br>, який вилучено на "
+"сервері.<br><br>Ви бажаєте відновити їх також?"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
+msgid "Undelete dependent primitives?"
+msgstr "Відновити залежні елементи?"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
+msgid "Properties in my dataset, i.e. the local dataset"
+msgstr "Властивості в моєму наборі даних, тобто локальному наборі даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
+msgid ""
+"Properties in the merged element. They will replace properties in my "
+"elements when merge decisions are applied."
+msgstr ""
+"Параметри в об'єднаному елементі. Параметри в моїх елементах будуть замінені "
+"при застосуванні об'єднання."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
+msgid "Properties in their dataset, i.e. the server dataset"
+msgstr "Властивості в чужому наборі даних, тобто наборі даних на сервері"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
+msgid "Coordinates:"
+msgstr "Координати:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
+msgid "Deleted State:"
+msgstr "Вилучений:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
+msgid "Visible State:"
+msgstr "Видимий:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
+msgid "Referenced by:"
+msgstr "Посилається на:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
+msgid "(none)"
+msgstr "(відсутній)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
+msgid "deleted"
+msgstr "вилучено"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
+msgid "not deleted"
+msgstr "не вилучений"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
+msgid "visible (on the server)"
+msgstr "видимий ( на сервері)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
+msgid "not visible (on the server)"
+msgstr "не видимий (на сервері)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
+msgid "Keep a clone of the local version"
+msgstr "Лишити клон локальної версії"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
+msgid "Physically delete from local dataset"
+msgstr "Фізично вилучити з локального набору даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
+msgid "Keep my coordiates"
+msgstr "Залишити мої координати"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
+msgid "Keep their coordiates"
+msgstr "Залишити чужі координати"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
+msgid "Undecide conflict between different coordinates"
+msgstr "Не розв’язувати конфлікт між різними координатами"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
+msgid "Keep my deleted state"
+msgstr "Залишити мій стан \"Вилучений\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
+msgid "Keep their deleted state"
+msgstr "Залишити чужий стан \"Вилучений\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
+msgid "Undecide conflict between deleted state"
+msgstr "Не розв’язувати конфлікти між вилученими станами"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
+msgid "Keep my visible state"
+msgstr "Залишити мій стан \"Видимий\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
+msgid "Yes, reset the id"
+msgstr "Так, перевстановити ідентифікатор"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
+#, java-format
+msgid ""
+"<html>To keep your local version, JOSM<br>has to reset the id of primitive "
+"{0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
+"you agree?</html>"
+msgstr ""
+"<html>Щоб зберегти свою локальну версію даних, JOSM<br>скине ідентифікатор "
+"елемента {0} на 0.<br>Під час наступного надсилання даних, сервер "
+"призначить<br> їм новий ідентифікатор.<br>Ви згодні?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
+msgid "Reset id to 0"
+msgstr "Встановити значення ідентифікатора в 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
+msgid "Keep their visible state"
+msgstr "Лишити чужий стан \"Видимий\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
+msgid "Yes, purge it"
+msgstr "Так, очистити"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
+#, java-format
+msgid ""
+"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
+"dataset.<br>Do you agree?</html>"
+msgstr ""
+"<html>JOSM вилучить ваш локальний елемент з ідентифікатором {0}<br>з набору "
+"даних.<br>Ви згодні?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
+msgid "Remove from dataset"
+msgstr "Вилучити з набору даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
+msgid "Undecide conflict between visible state"
+msgstr "Не розв’язувати конфлікти між станами \"Видимий\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java:35
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java:26
+msgid "Primitive"
+msgstr "Елемент"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
+msgid "Merged nodes not frozen yet. Cannot build resolution command"
+msgstr ""
+"Об'єднані точки ще не заморожені. Неможливо побудувати команду розв’язання "
+"конфліктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:38
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:52
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:55
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:60
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:46
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:59
+msgid "<undefined>"
+msgstr "<невизначено>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:36
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:39
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:53
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:56
+#, java-format
+msgid "The merged dataset will not include a tag with key {0}"
+msgstr "Об’єднаний набір даних не буде містити теґ з ключем {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:48
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java:61
+#, java-format
+msgid "My dataset does not include a tag with key {0}"
+msgstr "Мій набір даних не містить теґ з ключем {0}"
+
+#. setting up the properties table
+#: ../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/properties/PropertiesDialog.java:205
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:261
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:77
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
+msgid "Key"
+msgstr "Ключ"
+
+#: ../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/properties/PropertiesDialog.java:240
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:484
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:27
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:265
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:84
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:120
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
+msgid "Value"
+msgstr "Значення"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:99
+msgid "Cannot apply undecided tag merge item."
+msgstr ""
+"Неможливо застосувати теґ об'єднаного елемента із-за нерозв'язаного конфлікту"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
+msgid "My version (local dataset)"
+msgstr "Моя версія (локальний набір даних)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
+msgid "Their version (server dataset)"
+msgstr "Чужа версія (набір даних з сервера)"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
+msgid "Keep the selected key/value pairs from the local dataset"
+msgstr "Залишити виділені пари ключ/значення з локального набору даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
+msgid "Keep the selected key/value pairs from the server dataset"
+msgstr "Залишити виділені пари ключ/значення з набору даних з сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
+msgid "Undecide"
+msgstr "Відновити конфлікт"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
+msgid "Mark the selected tags as undecided"
+msgstr "Позначити виділені теґи, як нерозв'язані конфлікти"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:47
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:60
+#, java-format
+msgid "Their dataset does not include a tag with key {0}"
+msgstr "Чужий набір даних не містить тег з ключем {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131
+msgid "Conflicts when combining primitives"
+msgstr "Конфлікти під час об'єднання елементів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:135
+#, java-format
+msgid "Conflicts when combining ways - combined way is ''{0}''"
+msgstr "Конфлікти під час об’єднання ліній — отримана лінія: ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:140
+#, java-format
+msgid "Conflicts when merging nodes - target node is ''{0}''"
+msgstr "Конфлікти під час об’єднання точок— отримана точка: ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
+msgid "No conflicts to resolve"
+msgstr "Конфліктів не виявлено"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+msgid "Cancel conflict resolution"
+msgstr "Відмінити розв’язання конфліктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
+msgid "Apply resolved conflicts"
+msgstr "Застосувати розв’язки конфліктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1131
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:131
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:643
+msgid "Apply"
+msgstr "Застосувати"
+
+#: ../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:23
+msgid "none"
+msgstr "нічого"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
+#: build/trans_presets.java:2301
+msgid "all"
+msgstr "всі"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66
+msgid "Choose a value"
+msgstr "Виберіть значення"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
+msgid "Please decide which values to keep"
+msgstr "Будь ласка, вирішите, які значення залишити"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73
+#, java-format
+msgid "Value ''{0}'' is going to be applied for key ''{1}''"
+msgstr "Значення ''{0}'' буде встановлене ключу ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:79
+#, java-format
+msgid "The key ''{0}'' and all its values are going to be removed"
+msgstr "Ключ ''{0}'' і всі його значення будуть вилучені"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84
+#, java-format
+msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
+msgstr "Всі приєднані значення ''{0}'' будуть встановлені ключу ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:100
+#, java-format
+msgid "Tag collection does not include the selected value ''{0}''."
+msgstr "Набір теґів не містить виділене значення ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:212
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:249
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:267
+msgid "Not decided yet."
+msgstr "Ще не вирішено"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
+msgid "Tags from nodes"
+msgstr "Теґи точок «від»"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
+msgid "Tags from ways"
+msgstr "Теґи ліній «від»"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
+msgid "Tags from relations"
+msgstr "Теґи зв'язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
+msgid "Conflicts in pasted tags"
+msgstr "Кофлікти у вставлених теґах"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
+msgid "Paste ..."
+msgstr "Вставити…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
+msgid "From ..."
+msgstr "З…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:388
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
+msgid "To ..."
+msgstr "В…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#, java-format
+msgid "{0} tag"
+msgid_plural "{0} tags"
+msgstr[0] "{0} теґ"
+msgstr[1] "{0} теґи"
+msgstr[2] "{0} теґів"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
+#, java-format
+msgid "{0} way"
+msgid_plural "{0} ways"
+msgstr[0] "{0} лінія"
+msgstr[1] "{0} лінії"
+msgstr[2] "{0} ліній"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
+#, java-format
+msgid "{0} relation"
+msgid_plural "{0} relations"
+msgstr[0] "{0} зв’язок"
+msgstr[1] "{0} зв’язки"
+msgstr[2] "{0} зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
+#, java-format
+msgid "Position {0} is out of range. Current number of members is {1}."
+msgstr "Позиція {0} за межами діапазону. Поточна кількість членів {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:29
+msgid "Remove this relation member from the relation"
+msgstr "Вилучити цього члена із зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
+msgid "Keep"
+msgstr "Залишити"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
+msgid "Keep this relation member for the target object"
+msgstr "Залишити цього члена зв’язку у отриманому об’єкті"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:36
+msgid "Undecided"
+msgstr "Нерозв’язуваний"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
+msgid "Not decided yet"
+msgstr "Ще не розв’язаний"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
+msgid "Role:"
+msgstr "Роль:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
+msgid "Enter a role for all relation memberships"
+msgstr "Введіть роль для всіх членів зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
+msgid "Tag modified relations with "
+msgstr "Позначте змінені зв’язки теґом "
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
+msgid ""
+"<html>Select to enable entering a tag which will be applied<br>to all "
+"modified relations.</html>"
+msgstr ""
+"<html>Позначте, який теґ буде призначений <br>всім зміненим зв’язкам.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
+msgctxt "tag"
+msgid "Key:"
+msgstr "Ключ:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
+msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
+msgstr ""
+"<html>Введіть ключ теґу, наприклад: <strong><tt>fixme</tt></strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
+msgid "Value:"
+msgstr "Значення:"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
+msgid ""
+"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr ""
+"<html>Введіть значення теґу, наприклад: <strong><tt>перевірте членів</tt></"
+"strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
+msgid ""
+"<html>The combined ways are members in one ore more relations. Please decide "
+"whether you want to <strong>keep</strong> these memberships for the combined "
+"way or whether you want to <strong>remove</strong> them.<br>The default is "
+"to <strong>keep</strong> the first way and <strong>remove</strong> the other "
+"ways that are members of the same relation: the combined way will take the "
+"place of the original way in the relation.</html>"
+msgstr ""
+"<html>Лінії, що об’єднуються є членами одного або декількох зв’язків. "
+"Виберіть, <strong>залишити</strong> лінію членом цих зв’язків або "
+"<strong>вилучити</strong> її.<br>Типово у зв’язку <strong>залишається</"
+"strong> перша та <strong>вилучаються</strong> інші лінії — члени одного й "
+"того же зв’язку: нова лінія займає в зв’язку місце оригінальної лінії.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
+msgid ""
+"<html>The merged nodes are members in one ore more relations. Please decide "
+"whether you want to <strong>keep</strong> these memberships for the target "
+"node or whether you want to <strong>remove</strong> them.<br>The default is "
+"to <strong>keep</strong> the first node and <strong>remove</strong> the "
+"other nodes that are members of the same relation: the target node will take "
+"the place of the original node in the relation.</html>"
+msgstr ""
+"<html>Точки, що об’єднуються є членами одного або декількох зв’язків. "
+"Виберіть, <strong>залишити</strong> точку членом цих зв’язків або "
+"<strong>вилучити</strong> її.<br>Типово у зв’язку <strong>залишається</"
+"strong> перша та <strong>вилучаються</strong> інші точки — члени одного й "
+"того же зв’язку: нова точка займає в зв’язку місце оригінальної точки.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
+msgid "Apply this role to all members"
+msgstr "Застосувати цю роль всім членам зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
+msgid "Orig. Way"
+msgstr "Ориг. лінія"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
+msgid "Decision"
+msgstr "Рішення"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
+msgid "<html>Please select the values to keep for the following tags.</html>"
+msgstr ""
+"<html>Будь ласка, виберіть, які значення зберегти для нових теґів.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
+msgid "Show tags with conflicts only"
+msgstr "Показати тільки теґи з конфліктами"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49
+msgid "Show tags with multiple values only"
+msgstr "Показати тільки теґи з кількома значеннями"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
+msgid "For selected objects only"
+msgstr "Тільки для вибраних об'єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
+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>Виберіть для показу набори правок тільки вибраних об'єктів.<br>Скиньте "
+"вибір, щоб показати набори правок для всіх об’єктів поточного шару.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
+msgid "Changesets"
+msgstr "Набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
+msgid "Open the list of changesets in the current layer."
+msgstr "Відкрити список наборів змін у поточному шарі."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
+msgid "Select all objects assigned to the currently selected changesets"
+msgstr "Виділити всі об'єкти, що пов’язані із виділеними наборами змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:179
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:393
+msgid "Download"
+msgstr "Завантажити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:350
+msgid "Download information about the selected changesets from the OSM server"
+msgstr "Завантажити дані про виділені набори змін з сервера OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:385
+msgid "Closes the selected open changesets"
+msgstr "Закриває виділені відкриті набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:416
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:190
+msgid "Show info"
+msgstr "Показати інформацію"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:417
+msgid "Open a web page for each selected changeset"
+msgstr "Відкрити веб-сторінки для кожного виділеного набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:456
+msgid "Details"
+msgstr "Подробиці"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:457
+msgid "Opens the Changeset Manager window for the selected changesets"
+msgstr "Відкриває вікно Менеджера наборів змін для виділених наборів змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:66
+msgid "Command Stack"
+msgstr "Стек команд"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
+msgid "Open a list of all commands (undo buffer)."
+msgstr "Відкрити список всіх команд (буфер відміни)."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
+#, java-format
+msgid "Toggle: {0}"
+msgstr "Включити/Виключити: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:64
+#, java-format
+msgid "Command Stack: {0}"
+msgstr "Стек команд: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+msgid "Resolve conflicts."
+msgstr "Розв’язати конфлікти."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
+#, java-format
+msgid "Conflicts: {0} unresolved"
+msgstr "Конфлікти: {0} не розв’язано"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
+msgid "Resolve"
+msgstr "Розв’язано"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
+msgid "Open a merge dialog of all selected items in the list above."
+msgstr ""
+"Відкрити діалогове вікно для злиття виділених у вищенаведеному переліку "
+"об'єктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:306
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
+msgid ""
+"Set the selected elements on the map to the selected items in the list above."
+msgstr "Виділити на мапі об'єкти, вибрані у списку вгорі."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
+msgid "Cancel conflict resolution and close the dialog"
+msgstr "Скасувати розв’язання конфліктів і закрити діалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:225
+msgid "Apply resolved conflicts and close the dialog"
+msgstr "Застосувати розв’язання конфліктів і закрити діалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:226
+msgid "Apply Resolution"
+msgstr "Застосувати розв’язання"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:238
+msgid "Close anyway"
+msgstr "Все одно закрити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:239
+msgid "Continue resolving"
+msgstr "Продовжити розв’язання"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
+#, java-format
+msgid ""
+"<html>You did not finish to merge the differences in this conflict."
+"<br>Conflict resolutions will not be applied unless all differences<br>are "
+"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
+"Already<br>resolved differences will not be applied.</strong><br>Click "
+"<strong>{1}</strong> to return to resolving conflicts.</html>"
+msgstr ""
+"<html>Ви не закінчили злиття відмінностей у цьому конфлікті.<br>Розв’язання "
+"конфліктів не буде застосоване до тих пір, доки всі відмінності<br>не будуть "
+"опрацьовані.<br>Натисніть <strong>{0}</strong> щоб закрити у будь-якому "
+"випадку.<strong> Вже<br>опрацьовані відмінності не будуть застосовані.</"
+"strong><br>Натисніть <strong>{1}</strong>, щоб повернутись до розв’язання "
+"конфліктів.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:249
+msgid "Conflict not resolved completely"
+msgstr "Конфлікт розв’язано не до кінця"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:286
+msgid "Resolve conflicts"
+msgstr "Розв’язати конфлікти"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:288
+#, java-format
+msgid "Resolve conflicts for ''{0}''"
+msgstr "Розв’язати кнофлікти для ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:55
+msgid "Filter objects and hide/disable them."
+msgstr "Відфільтрувати об'єкти і приховати/відключити їх."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:79
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:635
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
+msgid "Add"
+msgstr "Додати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
+msgid "Add filter."
+msgstr "Додати фільтр."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
+msgid "Edit filter."
+msgstr "Редагувати фільтр."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
+msgid "Delete filter."
+msgstr "Вилучити фільтр."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:112
+msgid "Move filter up."
+msgstr "Перемістити фільтр вгору."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:123
+msgid "Move filter down."
+msgstr "Перемістити фільтр вниз."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:137
+msgid "Enable filter"
+msgstr "Увімкнути фільтр"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:138
+msgid "Hide elements"
+msgstr "Приховати елементи"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:140
+msgid "Apply also for children"
+msgstr "Застосувати також для нащадків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:141
+msgid "Inverse filter"
+msgstr "Інвертувати фільтр"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:142
+msgid "Filter mode"
+msgstr "Режим фільтра"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:217
+#, java-format
+msgid "Filter Hidden:{0} Disabled:{1}"
+msgstr "Фільтр Прихований:{0} Відключений:{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
+#: ../plugins/reverter/src/reverter/ReverterPlugin.java:20
+msgid "History"
+msgstr "Історія"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
+msgid "Display the history of all selected items."
+msgstr "Показати історію всіх обраних об'єктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:265
+msgid "Object with history"
+msgstr "Об'єкт із історією"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
+msgid "Reload"
+msgstr "Перезавантажити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:283
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Завантажити заново всі виділені об'єкти, і оновити список."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:322
+msgid "Show"
+msgstr "Показати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:323
+msgid "Display the history of the selected objects."
+msgstr "Показати історію виділених об'єктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
+msgid "Layers"
+msgstr "Шари"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+msgid "Open a list of all loaded layers."
+msgstr "Відкрити список всіх завантажених шарів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
+msgid "Delete the selected layers."
+msgstr "Вилучити вибрані шари."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
+msgid "Show/Hide"
+msgstr "Показати/сховати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
+msgid "Toggle visible state of the selected layer."
+msgstr "Показати/приховати виділений шар."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490
+msgid "Activate"
+msgstr "Активувати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
+msgid "Activate the selected layer"
+msgstr "Активувати вибраний шар"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
+msgid "Merge this layer into another layer"
+msgstr "Об'єднати цей шар з іншим шаром"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+msgid "Duplicate this layer"
+msgstr "Дублюйте цей шар"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
+msgid "Move the selected layer one row up."
+msgstr "Перемістити вибраний шар на один рядок вгору."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
+msgid "Move the selected layer one row down."
+msgstr "Перемістити вибраний шар на один рядок вниз."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Інформація про шар"
+
+#. item "Land use/Quarry" text "Name"
+#. <!-- FIXME: element role not yet supported! -->
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:768
+#: build/trans_presets.java:3179
+msgid "Relations"
+msgstr "Зв'язки"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:90
+msgid "Open a list of all relations."
+msgstr "Відкрити список усіх зв’язків."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:279
+msgid "Open an editor for the selected relation"
+msgstr "Відкрити вибраний зв’язок в редакторі"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:320
+msgid "Delete the selected relation"
+msgstr "Вилучити вибраний зв’язок"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:358
+msgid "Create a new relation"
+msgstr "Створити новий зв’язок"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:395
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
+msgid "Create a copy of this relation and open it in another editor window"
+msgstr "Створити копію цього зв’язку і відкрити його в іншому вікні редактора"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:433
+msgid "Set the current selection to the list of selected relations"
+msgstr "Встановити поточний вибір на списку виділених зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
+msgid "Select the members of all selected relations"
+msgstr "Виділити членів всіх вибраних зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:462
+msgid "Select members"
+msgstr "Вибрати членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:492
+msgid "Download all members of the selected relations"
+msgstr "Завантажити з сервера всіх членів вибраних зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:493
+msgid "Download members"
+msgstr "Завантажити членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:524
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:745
+msgid "Download incomplete members of selected relations"
+msgstr "Завантажити з сервер неповних членів вибраних зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:526
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:747
+msgid "Download incomplete members"
+msgstr "Завантажити неповних членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:766
+#, java-format
+msgid "Relations: {0}"
+msgstr "Зв’язки: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162
+msgid "Current Selection"
+msgstr "Поточне виділення"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161
+msgid "Open a selection list window."
+msgstr "Відкрити вікно зі списком виділених об'єктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:280
+msgid "Search for objects"
+msgstr "Пошук об'єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:334
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:335
+msgid "Zoom to selection"
+msgstr "Наблизитися до виділеного"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:368
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:369
+msgid "Zoom to selected element(s)"
+msgstr "Наблизитися до виділених елементів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:423
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:67
+msgid "Selection"
+msgstr "Виділення"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:434
+#, java-format
+msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
+msgstr "Вибр.: Зв’яз.:{0} / Ліній:{1} / Точок:{2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:711
+#, java-format
+msgid "Selection: {0}"
+msgstr "Вибір: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+msgid "Undock the panel"
+msgstr "Відстикувати панелі"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+msgid ""
+"Close this panel. You can reopen it with the buttons in the left toolbar."
+msgstr ""
+"Закрити цю панель. Ви можете відкрити її знову, використовуючи кнопки на "
+"лівій панелі."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+msgid "Click to minimize/maximize the panel content"
+msgstr "Натисніть на для зменшення/збільшення вмісту панелі"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:143
+msgid "Authors"
+msgstr "Автори"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:65
+msgid "Open a list of people working on the selected objects."
+msgstr "Показати список людей, що працюють з виділеними об'єктами."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:141
+#, java-format
+msgid "{0} Author"
+msgid_plural "{0} Authors"
+msgstr[0] "{0} Автор"
+msgstr[1] "{0} Автори"
+msgstr[2] "{0} Авторів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:160
+msgid "Select primitives submitted by this user"
+msgstr "Вибрати елементи, створені цим користувачем"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:191
+msgid "Launches a browser with information about the user"
+msgstr "Відкрити у оглядачі інформацію про користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
+#, java-format
+msgid ""
+"Warning: only launching info browsers for the first {0} of {1} selected users"
+msgstr ""
+"Увага: відкриваються сторінки інформації про перших {0} з {1} виділених "
+"користувачів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:226
+#, java-format
+msgid ""
+"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
+"this system.</html>"
+msgstr ""
+"<html>Збій створення URL, тому що кодування ''{0}''<br>відсутнє у цій "
+"системі.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:228
+msgid "Missing encoding"
+msgstr "Відсутнє кодування"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:278
+msgid "<new object>"
+msgstr "<новий_об’єкт>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:291
+msgid "Author"
+msgstr "Автор"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:291
+msgid "# Objects"
+msgstr "кіл-ть об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
+msgid "Display the basic properties of the changeset"
+msgstr "Показати основні властивості набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
+msgid "Display the tags of the changeset"
+msgstr "Показати теґи набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
+msgid "Content"
+msgstr "Вміст"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
+msgid "Display the objects created, updated, and deleted by the changeset"
+msgstr "Показати об'єкти, створені, оновлені і вилучені цим набором змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:267
+msgid "Changeset Management Dialog"
+msgstr "Вікно керування набором змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:200
+msgid "Close the dialog"
+msgstr "Закрити вікно"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163
+msgid "Query"
+msgstr "Запит"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
+msgid "Launch the dialog for querying changesets"
+msgstr "Відкрити вікно для запиту наборів змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:265
+msgid "Remove from cache"
+msgstr "Вилучити з кешу"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383
+msgid "Remove the selected changesets from the local cache"
+msgstr "Вилучити вибрані набори змін з локального кешу"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410
+msgid "Close the selected changesets"
+msgstr "Закрити вибрані набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:323
+msgid "Update changeset"
+msgstr "Оновити набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
+msgid "Updates the selected changesets with current data from the OSM server"
+msgstr "Оновлення вибраних наборів змін поточними даними з сервера OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
+msgid "Download changeset content"
+msgstr "Завантажити з сервера вміст набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
+msgid "Download the content of the selected changesets from the server"
+msgstr "Завантажити з сервера вміст виділених наборів змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
+msgid "My changesets"
+msgstr "Мій набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
+msgid "Download my changesets from the OSM server (max. 100 changesets)"
+msgstr "Завантажити мої набори змін з сервера OSM (макс. 100 наборів змін)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
+msgid ""
+"<html>JOSM is currently running with an anonymous user. It cannot "
+"download<br>your changesets from the OSM server unless you enter your OSM "
+"user name<br>in the JOSM preferences.</html>"
+msgstr ""
+"<html>JOSM запущений від імені анонімного користувача.Він не може "
+"завантажити<br>ваші набори змін з сервера OSM, поки не введено ім'я "
+"користувача<br>в налаштуваннях JOSM.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
+msgctxt "changeset.upload-comment"
+msgid "empty"
+msgstr "порожній"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:214
+msgctxt "changeset.state"
+msgid "Open"
+msgstr "Відкрити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:216
+msgctxt "changeset.state"
+msgid "Closed"
+msgstr "Закритий"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:221
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:155
+msgid "anonymous"
+msgstr "анонімний"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
+msgid "Comment"
+msgstr "Коментар"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
+msgid "Open"
+msgstr "Відкрити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:54
+msgid "User"
+msgstr "Користувач"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
+msgid "Created at"
+msgstr "Створено"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
+msgid "Closed at"
+msgstr "Закрито"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:82
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:95
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:110
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:179
+msgid "Downloading changeset content"
+msgstr "Завантаження з сервера вмісту набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170
+#, java-format
+msgid "({0}/{1}) Downloading changeset {2}..."
+msgstr "({0}/{1}) Завантаження набору змін {2}…"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177
+#, java-format
+msgid "({0}/{1}) Downloading content for changeset {2}..."
+msgstr "({0}/{1}) Завантаження вмісту набору змін {2}…"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:195
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:287
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
+msgid "Download content"
+msgstr "Завантажити вміст"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:197
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
+msgid "Download the changeset content from the OSM server"
+msgstr "Завантажити вміст набору змін з сервера OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:310
+msgid "Update content"
+msgstr "Оновити вміст"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:312
+msgid "Update the changeset content from the OSM server"
+msgstr "Оновити вміст набору змін з сервера OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:248
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
+msgid "Show history"
+msgstr "Показати історію"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
+msgid "Download and show the history of the selected primitives"
+msgstr "Завантажити та показати історію вибраних елементів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:356
+msgid "Select in layer"
+msgstr "Виділити в шарі"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
+msgid "Select the corresponding primitives in the current data layer"
+msgstr "Виберіть відповідні елементи в поточному шарі дані"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:386
+#, java-format
+msgid ""
+"<html>The selected object is not available in the current<br>edit layer "
+"''{0}''.</html>"
+msgid_plural ""
+"<html>None of the selected objects is available in the current<br>edit layer "
+"''{0}''.</html>"
+msgstr[0] ""
+"<html>Обраний об'єкт не доступний у поточному<br> редагованому шарі ''{0}''."
+"</html>"
+msgstr[1] ""
+"<html>Жоден з виділених об'єктів не доступний у поточному<br>редагованому "
+"шарі ''{0}''.</html>"
+msgstr[2] ""
+"<html>Жоден з виділених об'єктів не доступний у поточному<br>редагованому "
+"шарі ''{0}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370
+msgid "Nothing to select"
+msgstr "Нема що вибирати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:415
+msgid "Zoom to in layer"
+msgstr "Збільшити в шарі"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
+msgid "Zoom to the corresponding primitives in the current data layer"
+msgstr "Наблизитися до відповідних елементів у поточному шарі даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:429
+msgid "Nothing to zoom to"
+msgstr "Нема до чого наближатись"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
+msgid "The content of this changeset is not downloaded yet."
+msgstr "Зміст цього набору змін ще не завантажено."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
+msgid "Download now"
+msgstr "Завантажити зараз"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
+msgid "Download the changeset content"
+msgstr "Завантажити вміст набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
+msgid "Created"
+msgstr "Створено"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
+msgid "Updated"
+msgstr "Оновлено"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
+msgid "Deleted"
+msgstr "Вилучено"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
+msgid "ID"
+msgstr "Ідентифікатор"
+
+#. item "Highways/Streets/Motorway" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Trunk" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Primary" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Secondary" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Tertiary" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Unclassified" label "Edit Unclassified Road"
+#. <space />
+#. <key key="highway" value="unclassified" />
+#. <optional>
+#. item "Highways/Streets/Residential" label "Edit Residential Street"
+#. <space />
+#. <key key="highway" value="residential" />
+#. item "Highways/Streets/Living Street" label "Edit Living Street"
+#. <space />
+#. <key key="highway" value="living_street" />
+#. item "Highways/Streets/Pedestrian" label "Edit Pedestrian Street"
+#. <space />
+#. <key key="highway" value="pedestrian" />
+#. item "Highways/Streets/Road (Unknown Type)" label "Edit Road of unknown type"
+#. <space />
+#. <key key="highway" value="road" />
+#. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
+#. item "Highways/Streets/Bridge" label "Edit Bridge"
+#. <space />
+#. <key key="bridge" value="yes" />
+#. <optional>
+#. item "Highways/Streets/Tunnel" label "Edit Tunnel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:tunnel"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tunnel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:tunnel" />
+#. <space />
+#. <key key="tunnel" value="yes" />
+#. <optional>
+#. item "Ways/Track" label "Edit Track"
+#. <space />
+#. <key key="highway" value="track" />
+#. <optional>
+#. item "Ways/Path" label "Edit Path"
+#. <space />
+#. <key key="highway" value="path" />
+#. <optional>
+#. item "Ways/Dedicated Bridleway" label "Edit Bridleway"
+#. <space />
+#. <key key="highway" value="bridleway" />
+#. <optional>
+#. item "Ways/Dedicated Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="cycleway" />
+#. <optional>
+#. item "Ways/Segregated Foot- and Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="yes" />
+#. <optional>
+#. item "Ways/Combined Foot- and Cycleway" label "Edit Cycleway"
+#. <space />
+#. <key key="highway" value="path" />
+#. <key key="bicycle" value="designated" />
+#. <key key="foot" value="designated" />
+#. <key key="segregated" value="no" />
+#. <optional>
+#. item "Ways/Dedicated Footway" label "Edit Footway"
+#. <space />
+#. <key key="highway" value="footway" />
+#. <optional>
+#. item "Ways/Steps" label "Edit Flight of Steps"
+#. <space />
+#. <key key="highway" value="steps" />
+#. <optional>
+#. item "Waypoints/Motorway Junction" label "Edit Motorway Junction"
+#. <space />
+#. <key key="highway" value="motorway_junction" />
+#. item "Waypoints/Services" label "Edit Service Station"
+#. <space />
+#. <key key="highway" value="services" />
+#. <optional>
+#. item "Waypoints/City Limit" label "Edit City Limit Sign"
+#. <space />
+#. <key key="traffic_sign" value="city_limit" />
+#. <space />
+#. item "Waypoints/Ford" label "Edit Ford"
+#. <space />
+#. <key key="highway" value="ford" />
+#. <optional>
+#. item "Waypoints/Mountain Pass" label "Edit Mountain Pass"
+#. <space />
+#. <key key="mountain_pass" value="yes" />
+#. <optional>
+#. item "Barriers/Toll Booth" label "Edit Toll Booth"
+#. <space />
+#. <key key="barrier" value="toll_booth" />
+#. <optional>
+#. item "Water/Water/Spring" label "Edit Spring"
+#. <key key="natural" value="spring" />
+#. item "Water/Water/Drain" label "Edit Drain"
+#. <space />
+#. <key key="waterway" value="drain" />
+#. item "Water/Water/Ditch" label "Edit Ditch"
+#. <space />
+#. <key key="waterway" value="ditch" />
+#. item "Water/Water/Stream" label "Edit Stream"
+#. <space />
+#. <key key="waterway" value="stream" />
+#. item "Water/Water/Canal" label "Edit Canal"
+#. <space />
+#. <key key="waterway" value="canal" />
+#. item "Water/Water/River" label "Edit River"
+#. <space />
+#. <key key="waterway" value="river" />
+#. item "Water/Water/Water" label "Edit Water"
+#. <key key="natural" value="water" />
+#. item "Water/Water/Land" label "Edit Land"
+#. <key key="natural" value="land" />
+#. item "Water/Water/Basin" label "Edit Basin Landuse"
+#. <space />
+#. <key key="landuse" value="basin" />
+#. item "Water/Water/Reservoir" label "Edit Reservoir Landuse"
+#. <space />
+#. <key key="landuse" value="reservoir" />
+#. item "Water/Water/Covered Reservoir" label "Edit Covered Reservoir"
+#. <key key="man_made" value="reservoir_covered" />
+#. item "Water/Water/Riverbank" label "Edit Riverbank"
+#. <key key="waterway" value="riverbank" />
+#. item "Water/Water/Wetland" label "Edit Wetland"
+#. <key key="natural" value="wetland" />
+#. item "Water/Water/Mud" label "Edit Mud"
+#. <key key="natural" value="mud" />
+#. item "Water/Water/Beach" label "Edit Beach"
+#. <key key="natural" value="beach" />
+#. item "Water/Water/Bay" label "Edit Bay"
+#. <key key="natural" value="bay" />
+#. item "Water/Water/Cliff" label "Edit Cliff"
+#. <key key="natural" value="cliff" />
+#. item "Water/Water/Coastline" label "Edit Coastline"
+#. <key key="natural" value="coastline" />
+#. item "Water/Water/Ferry Route" label "Edit Ferry"
+#. <space />
+#. <key key="route" value="ferry" />
+#. <optional>
+#. item "Water/Water/Boatyard" label "Edit Boatyard"
+#. <space />
+#. <key key="waterway" value="boatyard" />
+#. item "Water/Water/Dock" label "Edit Dock"
+#. <space />
+#. <key key="waterway" value="dock" />
+#. item "Water/Water/Dam" label "Edit Dam"
+#. <space />
+#. <key key="waterway" value="dam" />
+#. item "Waterway Point/Weir" label "Edit Weir"
+#. <space />
+#. <key key="waterway" value="weir" />
+#. item "Waterway Point/Waterfall" label "Edit Waterfall"
+#. <space />
+#. <key key="waterway" value="waterfall" />
+#. item "Waterway Point/Marina" label "Edit Marina"
+#. <key key="leisure" value="marina" />
+#. item "Waterway Point/Pier" label "Edit Pier"
+#. <key key="man_made" value="pier" />
+#. item "Waterway Point/Ferry Terminal" label "Edit Ferry Terminal"
+#. <key key="amenity" value="ferry_terminal" />
+#. item "Waterway Point/Slipway" label "Edit Slipway"
+#. <key key="leisure" value="slipway" />
+#. item "Transport/Railway/Bus Guideway" label "Edit Bus Guideway"
+#. <space />
+#. <key key="highway" value="bus_guideway" />
+#. <optional>
+#. item "Aerialway/Chair Lift" label "Edit Chair Lift"
+#. <key key="aerialway" value="chair_lift" />
+#. item "Aerialway/Drag Lift" label "Edit Drag Lift"
+#. <key key="aerialway" value="drag_lift" />
+#. item "Aerialway/Cable Car" label "Edit Cable Car"
+#. <key key="aerialway" value="cable_car" />
+#. item "Aerialway/Gondola" label "Edit Gondola"
+#. <key key="aerialway" value="gondola" />
+#. item "Aerialway/Station" label "Edit Station"
+#. <key key="aerialway" value="station" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
+#. item "Car/Parking" label "Edit Parking"
+#. <key key="amenity" value="parking" />
+#. item "Car/Wash" label "Edit Car Wash"
+#. <key key="amenity" value="car_wash" />
+#. item "Car/Repair" label "Edit Car Repair"
+#. <key key="shop" value="car_repair" />
+#. item "Car/Rental" label "Edit Car Rental"
+#. <key key="amenity" value="car_rental" />
+#. item "Car/Sharing" label "Edit Car Sharing"
+#. <key key="amenity" value="car_sharing" />
+#. item "Bicycle/Parking" label "Edit Bicycle Parking"
+#. <key key="amenity" value="bicycle_parking" />
+#. item "Bicycle/Rental" label "Edit Bicycle Rental"
+#. <key key="amenity" value="bicycle_rental" />
+#. item "Public Transport/Station" label "Edit Station"
+#. <space />
+#. <key key="railway" value="station" />
+#. <optional>
+#. item "Public Transport/Railway Halt" label "Edit Halt"
+#. <space />
+#. <key key="railway" value="halt" />
+#. <optional>
+#. item "Public Transport/Tram Stop" label "Edit Tram Stop"
+#. <space />
+#. <key key="railway" value="tram_stop" />
+#. <optional>
+#. item "Public Transport/Subway Entrance" label "Edit Subway Entrance"
+#. <space />
+#. <key key="railway" value="subway_entrance" />
+#. <optional>
+#. item "Public Transport/Bus Station" label "Edit Bus Station"
+#. <key key="amenity" value="bus_station" />
+#. <optional>
+#. item "Public Transport/Bus Stop" label "Edit Bus Stop"
+#. <space />
+#. <key key="highway" value="bus_stop" />
+#. <optional>
+#. item "Public Transport/Taxi" label "Edit Taxi station"
+#. <key key="amenity" value="taxi" />
+#. item "Airport/Airport Ground" label "Edit Airport Ground"
+#. <key key="aeroway" value="aerodrome" />
+#. item "Airport/Terminal" label "Edit Terminal"
+#. <key key="aeroway" value="terminal" />
+#. item "Travel/Accomodation/Hotel" label "Edit Hotel"
+#. <key key="tourism" value="hotel" />
+#. item "Travel/Accomodation/Motel" label "Edit Motel"
+#. <key key="tourism" value="motel" />
+#. item "Travel/Accomodation/Guest House" label "Edit Guest House"
+#. <key key="tourism" value="guest_house" />
+#. item "Travel/Accomodation/Chalet" label "Edit Chalet"
+#. <key key="tourism" value="chalet" />
+#. item "Travel/Accomodation/Hostel" label "Edit Hostel"
+#. <key key="tourism" value="hostel" />
+#. item "Travel/Accomodation/Alpine Hut" label "Edit Alpine Hut"
+#. <key key="tourism" value="alpine_hut" />
+#. item "Travel/Accomodation/Caravan Site" label "Edit Caravan Site"
+#. <key key="tourism" value="caravan_site" />
+#. item "Travel/Accomodation/Camping Site" label "Edit Camping Site"
+#. <key key="tourism" value="camp_site" />
+#. item "Food+Drinks/Restaurant" label "Edit Restaurant"
+#. <key key="amenity" value="restaurant" />
+#. item "Food+Drinks/Fast Food" label "Edit Fast Food Restaurant"
+#. <key key="amenity" value="fast_food" />
+#. item "Food+Drinks/Cafe" label "Edit Cafe"
+#. <key key="amenity" value="cafe" />
+#. item "Food+Drinks/Pub" label "Edit Pub"
+#. <key key="amenity" value="pub" />
+#. item "Food+Drinks/Biergarten" label "Edit Biergarten"
+#. <key key="amenity" value="biergarten" />
+#. item "Food+Drinks/Bar" label "Edit Bar"
+#. <key key="amenity" value="bar" />
+#. item "Food+Drinks/Nightclub" label "Edit Nightclub"
+#. <key key="amenity" value="nightclub" />
+#. item "Tourism/Attraction" label "Edit Attraction"
+#. <key key="tourism" value="attraction" />
+#. item "Tourism/Museum" label "Edit Museum"
+#. <key key="tourism" value="museum" />
+#. item "Tourism/Zoo" label "Edit Zoo"
+#. <key key="tourism" value="zoo" />
+#. item "Tourism/Viewpoint" label "Edit Viewpoint"
+#. <key key="tourism" value="viewpoint" />
+#. item "Tourism/Theme Park" label "Edit Theme Park"
+#. <key key="tourism" value="theme_park" />
+#. item "Tourism/Artwork" label "Edit Artwork"
+#. <key key="tourism" value="artwork" />
+#. item "Tourism/Information Office"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="office" />
+#. item "Tourism/Map"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="map" />
+#. item "Tourism/Information Board"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:information%3Dboard" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="board" />
+#. item "Tourism/Guidepost"
+#. <link href="http://wiki.openstreetmap.org/index.php/Proposed_features/Guidepost" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="guidepost" />
+#. item "Tourism/Information Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="terminal" />
+#. item "Tourism/Audioguide"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:information" />
+#. <key key="tourism" value="information" />
+#. <key key="information" value="audioguide" />
+#. item "Tourism/Other Information Points"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism%3Dinformation" />
+#. <key key="tourism" value="information" />
+#. item "Tourism/Shelter" label "Edit Shelter"
+#. <key key="amenity" value="shelter" />
+#. item "Tourism/Picnic Site" label "Edit Picnic Site"
+#. <key key="tourism" value="picnic_site" />
+#. item "Historic Places/Castle" label "Edit Castle"
+#. <key key="historic" value="castle" />
+#. item "Historic Places/Ruins" label "Edit Ruins"
+#. <key key="historic" value="ruins" />
+#. item "Historic Places/Archaeological Site" label "Edit Archaeological Site"
+#. <key key="historic" value="archaeological_site" />
+#. item "Historic Places/Battlefield" label "Edit Battlefield"
+#. <key key="historic" value="battlefield" />
+#. item "Historic Places/Palaeontological Site" label "Edit Palaeontological Site"
+#. <key key="geological" value="palaeontological_site" />
+#. item "Historic Places/Monument" label "Edit Monument"
+#. <key key="historic" value="monument" />
+#. item "Historic Places/Memorial" label "Edit Memorial"
+#. <key key="historic" value="memorial" />
+#. item "Historic Places/Wayside Cross" label "Edit Wayside Cross"
+#. <key key="historic" value="wayside_cross" />
+#. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
+#. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
+#. item "Leisure/Water Park" label "Edit Water Park"
+#. <key key="leisure" value="water_park" />
+#. item "Leisure/Playground" label "Edit Playground"
+#. <key key="leisure" value="playground" />
+#. item "Leisure/Fishing" label "Edit Fishing"
+#. <key key="leisure" value="fishing" />
+#. item "Sports/Sport Facilities/Stadium" label "Edit Stadium"
+#. <key key="leisure" value="stadium" />
+#. item "Sports/Sport Facilities/Sports Centre" label "Edit Sports Centre"
+#. <key key="leisure" value="sports_centre" />
+#. item "Sports/Sport Facilities/Pitch" label "Edit Pitch"
+#. <key key="leisure" value="pitch" />
+#. item "Sports/Sport Facilities/Racetrack" label "Edit Racetrack"
+#. <key key="leisure" value="track" />
+#. item "Sports/Sport Facilities/Golf Course" label "Edit Golf Course"
+#. <key key="leisure" value="golf_course" />
+#. item "Sports/Sport Facilities/Miniature Golf" label "Edit Miniature Golf"
+#. <key key="leisure" value="miniature_golf" />
+#. item "Sport/Multi" label "Edit Multi"
+#. <key key="sport" value="multi" />
+#. item "Sport/10pin" label "Edit 10pin"
+#. <key key="sport" value="10pin" />
+#. item "Sport/Athletics" label "Edit Athletics"
+#. <key key="sport" value="athletics" />
+#. item "Sport/Archery" label "Edit Archery"
+#. <key key="sport" value="archery" />
+#. item "Sport/Climbing" label "Edit Climbing"
+#. <key key="sport" value="climbing" />
+#. item "Sport/Canoeing" label "Edit Canoeing"
+#. <key key="sport" value="canoe" />
+#. item "Sport/Cycling" label "Edit Cycling"
+#. <key key="sport" value="cycling" />
+#. item "Sport/Dog Racing" label "Edit Dog Racing"
+#. <key key="sport" value="dog_racing" />
+#. item "Sport/Equestrian" label "Edit Equestrian"
+#. <key key="sport" value="equestrian" />
+#. item "Sport/Horse Racing" label "Edit Horse Racing"
+#. <key key="sport" value="horse_racing" />
+#. item "Sport/Gymnastics" label "Edit Gymnastics"
+#. <key key="sport" value="gymnastics" />
+#. item "Sport/Motor Sports" label "Edit Motor Sports"
+#. <key key="sport" value="motor" />
+#. item "Sport/Skating" label "Edit Skating"
+#. <key key="sport" value="skating" />
+#. item "Sport/Skateboard" label "Edit Skateboard"
+#. <key key="sport" value="skateboard" />
+#. item "Sport/Swimming" label "Edit Swimming"
+#. <key key="sport" value="swimming" />
+#. item "Sport/Skiing" label "Edit Skiing"
+#. <key key="sport" value="skiing" />
+#. item "Sport/Shooting" label "Edit Shooting"
+#. <key key="sport" value="shooting" />
+#. item "Sport (Ball)/Soccer" label "Edit Soccer"
+#. <key key="sport" value="soccer" />
+#. item "Sport (Ball)/Football" label "Edit Football"
+#. <key key="sport" value="football" />
+#. item "Sport (Ball)/Australian Football" label "Edit Australian Football"
+#. <key key="sport" value="australian_football" />
+#. item "Sport (Ball)/Baseball" label "Edit Baseball"
+#. <key key="sport" value="baseball" />
+#. item "Sport (Ball)/Basketball" label "Edit Basketball"
+#. <key key="sport" value="basketball" />
+#. item "Sport (Ball)/Golf" label "Edit Golf"
+#. <key key="sport" value="golf" />
+#. item "Sport (Ball)/Boule" label "Edit Boule"
+#. <key key="sport" value="boules" />
+#. item "Sport (Ball)/Bowls" label "Edit Bowls"
+#. <key key="sport" value="bowls" />
+#. item "Sport (Ball)/Cricket" label "Edit Cricket"
+#. <key key="sport" value="cricket" />
+#. item "Sport (Ball)/Cricket Nets" label "Edit Cricket Nets"
+#. <key key="sport" value="cricket_nets" />
+#. item "Sport (Ball)/Croquet" label "Edit Croquet"
+#. <key key="sport" value="croquet" />
+#. item "Sport (Ball)/Hockey" label "Edit Hockey"
+#. <key key="sport" value="hockey" />
+#. item "Sport (Ball)/Pelota" label "Edit Pelota"
+#. <key key="sport" value="pelota" />
+#. item "Sport (Ball)/Racquet" label "Edit Racquet"
+#. <key key="sport" value="racquet" />
+#. item "Sport (Ball)/Rugby" label "Edit Rugby"
+#. <key key="sport" value="rugby" />
+#. item "Sport (Ball)/Table Tennis" label "Edit Table Tennis"
+#. <key key="sport" value="table_tennis" />
+#. item "Sport (Ball)/Tennis" label "Edit Tennis"
+#. <key key="sport" value="tennis" />
+#. item "Man-Made/Buildings/Public Building" label "Edit Public Building"
+#. <key key="amenity" value="public_building" />
+#. item "Man-Made/Buildings/Town hall" label "Edit Town hall"
+#. <key key="amenity" value="townhall" />
+#. item "Man-Made/Buildings/Embassy" label "Edit Embassy"
+#. <key key="amenity" value="embassy" />
+#. item "Man-Made/Buildings/Courthouse" label "Edit Courthouse"
+#. <key key="amenity" value="courthouse" />
+#. item "Man-Made/Buildings/Prison" label "Edit Prison"
+#. <key key="amenity" value="prison" />
+#. item "Man-Made/Buildings/Police" label "Edit Police"
+#. <key key="amenity" value="police" />
+#. item "Man-Made/Buildings/Fire Station" label "Edit Fire Station"
+#. <key key="amenity" value="fire_station" />
+#. item "Man-Made/Buildings/Post Office" label "Edit Post Office"
+#. <key key="amenity" value="post_office" />
+#. item "Man-Made/Buildings/Kindergarten" label "Edit Kindergarten"
+#. <key key="amenity" value="kindergarten" />
+#. item "Man-Made/Buildings/School" label "Edit School"
+#. <key key="amenity" value="school" />
+#. item "Man-Made/Buildings/University" label "Edit University"
+#. <key key="amenity" value="university" />
+#. item "Man-Made/Buildings/College" label "Edit College"
+#. <key key="amenity" value="college" />
+#. item "Man-Made/Buildings/Cinema" label "Edit Cinema"
+#. <key key="amenity" value="cinema" />
+#. item "Man-Made/Buildings/Library" label "Edit Library"
+#. <key key="amenity" value="library" />
+#. item "Man-Made/Buildings/Arts Centre" label "Edit Arts Centre"
+#. <key key="amenity" value="arts_centre" />
+#. item "Man-Made/Buildings/Theatre" label "Edit Theatre"
+#. <key key="amenity" value="theatre" />
+#. item "Man-Made/Buildings/Place of Worship" label "Edit Place of Worship"
+#. <key key="amenity" value="place_of_worship" />
+#. item "Man Made/Works" label "Edit Works"
+#. <key key="man_made" value="works" />
+#. item "Man Made/Tower" label "Edit Tower"
+#. <key key="man_made" value="tower" />
+#. item "Man Made/Water Tower" label "Edit Water Tower"
+#. <key key="man_made" value="water_tower" />
+#. item "Man Made/Gasometer" label "Edit Gasometer"
+#. <key key="man_made" value="gasometer" />
+#. item "Man Made/Lighthouse" label "Edit Lighthouse"
+#. <key key="man_made" value="lighthouse" />
+#. item "Man Made/Windmill" label "Edit Windmill"
+#. <key key="man_made" value="windmill" />
+#. item "Man Made/Wastewater Plant" label "Edit Wastewater Plant"
+#. <key key="man_made" value="wastewater_plant" />
+#. item "Man Made/Crane" label "Edit Crane"
+#. <key key="man_made" value="crane" />
+#. item "Man Made/Beacon" label "Edit Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Man Made/Survey Point" label "Edit Survey Point"
+#. <key key="man_made" value="survey_point" />
+#. item "Man Made/Surveillance" label "Edit Surveillance Camera"
+#. <key key="man_made" value="surveillance" />
+#. item "Man Made/Power Station" label "Edit Power Station"
+#. <key key="power" value="station" />
+#. item "Amenities/Fountain" label "Edit Fountain"
+#. <key key="amenity" value="fountain" />
+#. 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" />
+#. item "Shops/Chemist" label "Edit Chemist"
+#. <key key="shop" value="chemist" />
+#. item "Shops/Convenience Store" label "Edit Convenience Store"
+#. <key key="shop" value="convenience" />
+#. item "Shops/Kiosk" label "Edit Kiosk"
+#. <key key="shop" value="kiosk" />
+#. item "Shops/Book Store" label "Edit Book Store"
+#. <key key="shop" value="books" />
+#. item "Shops/Travel Agency" label "Edit Travel Agency"
+#. <key key="shop" value="travel_agency" />
+#. item "Shops/Butcher" label "Edit Butcher"
+#. <key key="shop" value="butcher" />
+#. item "Shops/Baker" label "Edit Baker"
+#. <key key="shop" value="bakery" />
+#. item "Shops/Florist" label "Edit Florist"
+#. <key key="shop" value="florist" />
+#. item "Shops/Organic" label "Edit Organic Shop"
+#. <key key="shop" value="organic" />
+#. item "Shops/Alcohol" label "Edit Alcohol Shop"
+#. <key key="shop" value="alcohol" />
+#. item "Shops/Beverages" label "Edit Beverages Shop"
+#. <key key="shop" value="beverages" />
+#. item "Shops/Computer" label "Edit Computer Shop"
+#. <key key="shop" value="computer" />
+#. item "Shops/Electronics" label "Edit Electronics Shop"
+#. <key key="shop" value="electronics" />
+#. item "Shops/Hifi" label "Edit Hifi Shop"
+#. <key key="shop" value="hifi" />
+#. item "Shops/Furniture" label "Edit Furniture Shop"
+#. <key key="shop" value="furniture" />
+#. item "Shops/Garden Centre" label "Edit Garden Centre"
+#. <key key="shop" value="garden_centre" />
+#. item "Shops/Hardware" label "Edit Hardware Store"
+#. <key key="shop" value="hardware" />
+#. item "Shops/Do-it-yourself-store" label "Edit Do-it-yourself-store"
+#. <key key="shop" value="doityourself" />
+#. item "Shops/Stationery" label "Edit Stationery Shop"
+#. <key key="shop" value="stationery" />
+#. item "Shops/Hairdresser" label "Edit Hairdresser"
+#. <key key="shop" value="hairdresser" />
+#. item "Shops/Shoes" label "Edit Shoe Shop"
+#. <key key="shop" value="shoes" />
+#. item "Shops/Toys" label "Edit Toy Shop"
+#. <key key="shop" value="toys" />
+#. item "Shops/Video" label "Edit Video Shop"
+#. <key key="shop" value="video" />
+#. item "Shops/Dry Cleaning" label "Edit Dry Cleaning"
+#. <key key="shop" value="dry_cleaning" />
+#. item "Shops/Laundry" label "Edit Laundry"
+#. <key key="shop" value="laundry" />
+#. item "Shops/Outdoor" label "Edit Outdoor Shop"
+#. <key key="shop" value="outdoor" />
+#. item "Shops/Sports" label "Edit Sports Shop"
+#. <key key="shop" value="sports" />
+#. item "Shops/Optician" label "Edit Optician"
+#. <key key="shop" value="optician" />
+#. item "Cash/Bank" label "Edit Bank"
+#. <key key="amenity" value="bank" />
+#. item "Cash/Money Exchange" label "Edit Money Exchange"
+#. <key key="amenity" value="bureau_de_change" />
+#. item "Health/Doctors" label "Edit Doctors"
+#. <key key="amenity" value="doctors" />
+#. item "Health/Dentist" label "Edit Dentist"
+#. <key key="amenity" value="dentist" />
+#. item "Health/Hospital" label "Edit Hospital"
+#. <key key="amenity" value="hospital" />
+#. item "Health/Veterinary" label "Edit Veterinary"
+#. <key key="amenity" value="veterinary" />
+#. item "Geography/Places/Continent" label "Edit Continent"
+#. <space />
+#. <key key="place" value="continent" />
+#. item "Geography/Places/Country" label "Edit Country"
+#. <space />
+#. <key key="place" value="country" />
+#. item "Geography/Places/State" label "Edit State"
+#. <space />
+#. <key key="place" value="state" />
+#. item "Geography/Places/Region" label "Edit Region"
+#. <space />
+#. <key key="place" value="region" />
+#. item "Geography/Places/County" label "Edit County"
+#. <space />
+#. <key key="place" value="county" />
+#. item "Geography/Places/City" label "Edit City"
+#. <space />
+#. <key key="place" value="city" />
+#. item "Geography/Places/Town" label "Edit Town"
+#. <space />
+#. <key key="place" value="town" />
+#. item "Geography/Places/Suburb" label "Edit Suburb"
+#. <space />
+#. <key key="place" value="suburb" />
+#. item "Geography/Places/Village" label "Edit Village"
+#. <space />
+#. <key key="place" value="village" />
+#. item "Geography/Places/Hamlet" label "Edit Hamlet"
+#. <space />
+#. <key key="place" value="hamlet" />
+#. item "Geography/Places/Locality" label "Edit Locality"
+#. <space />
+#. <key key="place" value="locality" />
+#. item "Geography/Places/Island" label "Edit Island"
+#. <space />
+#. <key key="place" value="island" />
+#. item "Geography/Places/Islet" label "Edit Islet"
+#. <space />
+#. <key key="place" value="islet" />
+#. item "Geography/Places/Cave Entrance" label "Edit Cave Entrance"
+#. <key key="natural" value="cave_entrance" />
+#. item "Geography/Places/Peak" label "Edit Peak"
+#. <key key="natural" value="peak" />
+#. item "Geography/Places/Glacier" label "Edit Glacier"
+#. <key key="natural" value="glacier" />
+#. item "Geography/Places/Volcano" label "Edit Volcano"
+#. <key key="natural" value="volcano" />
+#. item "Boundaries/National" label "Edit National Boundary"
+#. <space />
+#. <key key="boundary" value="national" />
+#. item "Boundaries/Administrative" label "Edit Administrative Boundary"
+#. <space />
+#. <key key="boundary" value="administrative" />
+#. item "Boundaries/Civil" label "Edit Civil Boundary"
+#. <space />
+#. <key key="boundary" value="civil" />
+#. item "Boundaries/Political" label "Edit Political Boundary"
+#. <space />
+#. <key key="boundary" value="political" />
+#. item "Boundaries/National park" label "Edit National Park Boundary"
+#. <space />
+#. <key key="boundary" value="national_park" />
+#. item "Land use/Tree" label "Edit Tree"
+#. <key key="natural" value="tree" />
+#. item "Land use/Wood" label "Edit Wood"
+#. <key key="natural" value="wood" />
+#. item "Land use/Forest" label "Edit Forest Landuse"
+#. <space />
+#. <key key="landuse" value="forest" />
+#. item "Land use/Nature Reserve" label "Edit Nature Reserve"
+#. <key key="leisure" value="nature_reserve" />
+#. item "Land use/Scree" label "Edit Scree"
+#. <key key="natural" value="scree" />
+#. item "Land use/Scrub" label "Edit Scrub"
+#. <key key="natural" value="scrub" />
+#. item "Land use/Fell" label "Edit Fell"
+#. <key key="natural" value="fell" />
+#. item "Land use/Heath" label "Edit Heath"
+#. <key key="natural" value="heath" />
+#. item "Land use/Farmyard" label "Edit Farmyard Landuse"
+#. <space />
+#. <key key="landuse" value="farmyard" />
+#. item "Land use/Farmland" label "Edit Farmland Landuse"
+#. <space />
+#. <key key="landuse" value="farmland" />
+#. item "Land use/Meadow" label "Edit Meadow Landuse"
+#. <space />
+#. <key key="landuse" value="meadow" />
+#. item "Land use/Vineyard" label "Edit Vineyard Landuse"
+#. <space />
+#. <key key="landuse" value="vineyard" />
+#. item "Land use/Allotments" label "Edit Allotments Landuse"
+#. <space />
+#. <key key="landuse" value="allotments" />
+#. item "Land use/Garden" label "Edit Garden"
+#. <key key="leisure" value="garden" />
+#. item "Land use/Grass" label "Edit Grass Landuse"
+#. <space />
+#. <key key="landuse" value="grass" />
+#. item "Land use/Village Green" label "Edit Village Green Landuse"
+#. <space />
+#. <key key="landuse" value="village_green" />
+#. item "Land use/Common" label "Edit Common"
+#. <key key="leisure" value="common" />
+#. item "Land use/Park" label "Edit Park"
+#. <key key="leisure" value="park" />
+#. item "Land use/Recreation Ground" label "Edit Recreation Ground Landuse"
+#. <space />
+#. <key key="landuse" value="recreation_ground" />
+#. item "Land use/Residential area" label "Edit Residential Landuse"
+#. <space />
+#. <key key="landuse" value="residential" />
+#. item "Land use/Graveyard" label "Edit Graveyard"
+#. <key key="amenity" value="grave_yard" />
+#. item "Land use/Cemetery" label "Edit Cemetery Landuse"
+#. <space />
+#. <key key="landuse" value="cemetery" />
+#. item "Land use/Retail" label "Edit Retail Landuse"
+#. <space />
+#. <key key="landuse" value="retail" />
+#. item "Land use/Commercial" label "Edit Commercial Landuse"
+#. <space />
+#. <key key="landuse" value="commercial" />
+#. item "Land use/Industrial" label "Edit Industrial Landuse"
+#. <space />
+#. <key key="landuse" value="industrial" />
+#. item "Land use/Railway land" label "Edit Railway Landuse"
+#. <space />
+#. <key key="landuse" value="railway" />
+#. item "Land use/Military" label "Edit Military Landuse"
+#. <space />
+#. <key key="landuse" value="military" />
+#. item "Land use/Construction area" label "Edit Construction Landuse"
+#. <space />
+#. <key key="landuse" value="construction" />
+#. item "Land use/Brownfield" label "Edit Brownfield Landuse"
+#. <space />
+#. <key key="landuse" value="brownfield" />
+#. item "Land use/Greenfield" label "Edit Greenfield Landuse"
+#. <space />
+#. <key key="landuse" value="greenfield" />
+#. item "Land use/Landfill" label "Edit Landfill Landuse"
+#. <space />
+#. <key key="landuse" value="landfill" />
+#. item "Land use/Quarry" label "Edit Quarry Landuse"
+#. <space />
+#. <key key="landuse" value="quarry" />
+#. item "Relations/Multipolygon" label "Edit Multipolygon"
+#. <key key="type" value="multipolygon" />
+#. <optional>
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
+#: build/trans_presets.java:78 build/trans_presets.java:114
+#: build/trans_presets.java:154 build/trans_presets.java:191
+#: build/trans_presets.java:211 build/trans_presets.java:229
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: 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:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
+msgid "Name"
+msgstr "Назва"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115
+msgid "ID:"
+msgstr "Ідентифікатор:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128
+msgid "Comment:"
+msgstr "Коментар:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
+msgid "Open/Closed:"
+msgstr "Відкрито/Закрито:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
+msgid "Created by:"
+msgstr "Створив:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
+msgid "Created on:"
+msgstr "Створено:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
+msgid "Closed on:"
+msgstr "Закрито:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
+msgid "Remove the changeset in the detail view panel from the local cache"
+msgstr ""
+"Вилучити з локального кешу набір правок, зазначений у панелі докладного "
+"вигдяу"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
+msgid "Update the changeset from the OSM server"
+msgstr "Оновлення набору змін з сервера OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
+msgid ""
+"Select the primitives in the content of this changeset in the current data "
+"layer"
+msgstr "Вибрати елементи у вмісті цього набору змін у поточному шарі даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:424
+#, java-format
+msgid ""
+"<html>None of the objects in the content of changeset {0} is available in "
+"the current<br>edit layer ''{1}''.</html>"
+msgstr ""
+"<html>Жоден з об’єктів набору змін {0} недоступний у поточному <br>шарі що "
+"редагується ''{1}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:417
+msgid ""
+"Zoom to the primitives in the content of this changeset in the current data "
+"layer"
+msgstr ""
+"Наблизитися до елементів вмісту цього набору змін у поточному шарі даних"
+
+#. parent for dialog is Main.parent
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:112
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
+msgid "Download changesets"
+msgstr "Завантажити з сервера набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
+#, java-format
+msgid "{0} [incomplete]"
+msgstr "{0} [неповний]"
+
+#: ../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
+msgid "closed"
+msgstr "закритий"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45
+msgid "Changeset ID: "
+msgstr "Номер набору змін: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
+msgid "Enter a changeset id"
+msgstr "Введіть номер набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
+msgid ""
+"Download the changeset with the specified id, including the changeset content"
+msgstr "Завантажити набір змін з вказаним номером, включаючи вміст набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
+msgid ""
+"The current value is not a valid changeset ID. Please enter an integer value "
+"> 0"
+msgstr ""
+"Поточне значення не є допустимим номером набору змін. Введіть ціле число> 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:48
+msgid "Please enter an integer value > 0"
+msgstr "Будь ласка, введіть ціле число> 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
+msgid "Select changesets owned by specific users"
+msgstr "Виберіть набори змін, що належать певним користувачам"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
+msgid "Select changesets depending on whether they are open or closed"
+msgstr "Виберіть набори змін залежно від того, відкриті вони або закриті"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
+msgid ""
+"Select changesets based on the date/time they have been created or closed"
+msgstr ""
+"Виберіть набори змін залежно від дати і часу, коли вони були створені або "
+"закриті"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
+msgid "Select only changesets related to a specific bounding box"
+msgstr ""
+"Вибрати тільки набори змін, пов'язані з конкретним габаритним прямокутником"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
+msgid "Query open changesets only"
+msgstr "Запитати тільки відкриті набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
+msgid "Query closed changesets only"
+msgstr "Запитати тільки закриті набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
+msgid "Query both open and closed changesets"
+msgstr "Запитати відкриті та закриті набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
+msgid "User ID:"
+msgstr "Ід. користувача:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
+msgid "User name:"
+msgstr "Ім'я користувача:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
+msgid "Only changesets owned by myself"
+msgstr "Тільки мої набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:457
+msgid "Only changesets owned by the user with the following user ID"
+msgstr "Тільки набори змін користувача з ідентифікатором"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
+msgid "Only changesets owned by the user with the following user name"
+msgstr "Тільки набори змін користувача з іменем"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
+msgid ""
+"Cannot restrict changeset query to the current user because the current user "
+"is anonymous"
+msgstr ""
+"Не вдається обмежити набір змін запитів для активного користувача, так як "
+"поточний користувач є анонімним"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:533
+#, java-format
+msgid "Current value ''{0}'' for user ID is not valid"
+msgstr "Поточне значення ''{0}'' для ідентифікатора користувача недійсне"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
+#, java-format
+msgid "Cannot restrict the changeset query to the user name ''{0}''"
+msgstr ""
+"Не можливо обмежити запит набору змін для користувача з іменем — ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
+msgid "Please enter a valid user ID"
+msgstr "Будь ласка, введіть дійсний ідентифікатор користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
+msgid "Invalid user ID"
+msgstr "Недійсний ідентифікатор користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
+msgid "Please enter a non-empty user name"
+msgstr "Будь ласка, введіть непорожнє ім'я користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
+msgid "Invalid user name"
+msgstr "Невірне ім'я користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
+msgid "Date: "
+msgstr "Дата: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
+msgid "Closed after - "
+msgstr "Закрито після - "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720
+msgid "Date:"
+msgstr "Дата:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
+msgid "Created before - "
+msgstr "Створено до - "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
+msgid "Only changesets closed after the following date/time"
+msgstr "Тільки набори змін закриті після вказаної дати/часу"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
+msgid "Only changesets closed after and created before a specific date/time"
+msgstr "Тільки набори змін закриті після і створені до вказаної дати/часу"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
+msgid ""
+"Cannot build changeset query with time based restrictions. Input is not "
+"valid."
+msgstr ""
+"Неможливо виконати запит набору змін на основі обмежень за часом. Введене "
+"невірне значення."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
+msgid ""
+"<html>Please enter valid date/time values to restrict<br>the query to a "
+"specific time range.</html>"
+msgstr ""
+"<html>Будь ласка, вкажіть правильні значення для дати/часу щоб "
+"обмежити<br>запит зазначеними часовими межами.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
+msgid "Invalid date/time values"
+msgstr "Невірні значення дати/часу"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
+msgid ""
+"Cannot restrict the changeset query to a specific bounding box. The input is "
+"invalid."
+msgstr ""
+"Неможливо обмежити запит на отримання набору змін в межах габаритного "
+"прямокутника. Введене невірне значення."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
+msgid ""
+"<html>Please enter valid longitude/latitude values to restrict<br>the "
+"changeset query to a specific bounding box.</html>"
+msgstr ""
+"<html>Будь ласка, введіть правильні значення довготи/широти, щоб "
+"обмежити<br>запит набору змін межами певного габаритного прямокутника.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
+msgid "Invalid bounding box"
+msgstr "Невірний габаритний прямокутник"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
+msgid ""
+"The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr ""
+"Поточне значення не є вірним ідентифікатором користувача. Будь ласка, "
+"введіть ціле значення > 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
+msgid ""
+"<html>The  current value is not a valid user name.<br>Please enter an non-"
+"empty user name.</html>"
+msgstr ""
+"<html>Поточне значення не є вірним ідентифікатором користувача.<br>Будь "
+"ласка, введіть непорожнє ім'я користувача.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
+msgid "Please enter an non-empty user name"
+msgstr "Будь ласка, введіть непорожнє ім'я користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
+#, java-format
+msgid ""
+"Please enter a date in the usual format for your locale.<br>Example: {0}"
+"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Будь ласка, введіть дату в звичайному форматі для вашої мови.<br>Приклад: {0}"
+"<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
+#, java-format
+msgid ""
+"Please enter a valid time in the usual format for your locale.<br>Example: "
+"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgstr ""
+"Будь ласка, введіть час у вірному форматі для вашої мови.<br>Приклад: {0}"
+"<br>Приклад: {1}<br>Приклад: {2}<br>Приклад: {3}<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
+msgid "Download my changesets only"
+msgstr "Завантажити тільки мої набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
+msgid ""
+"<html>Select to restrict the query to your changesets only.<br>Unselect to "
+"include all changesets in the query.</html>"
+msgstr ""
+"<html>Позначте, щоб обмежитися запитом тільки до ваших наборів змін."
+"<br>Зніміть позначку, щоб включити в запит всі набори змін.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126
+msgid ""
+"<html>Please select one the following <strong>standard queries</strong>."
+"Select <strong>Download my changesets only</strong> if you only want to "
+"download changesets created by yourself.<br>Note that JOSM will download "
+"max. 100 changesets.</html>"
+msgstr ""
+"<html>Будь ласка, виберіть один з наступних <strong>стандартних запитів</"
+"strong>. Позначте <strong>Завантажити тільки мої набори</strong>, якщо ви "
+"бажаєте завантажити тільки набори змін, створені вами. Зверніть увагу, що "
+"JOSM може завантажити не більше 100 наборів змін.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
+msgid "<html>Download the latest changesets</html>"
+msgstr "<html>Завантажити з сервера останні набори змін</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:154
+msgid ""
+"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
+"user name in the preferences first.</em></html>"
+msgstr ""
+"<html>Завантажити мої відкриті набори змін<br><em>Відключено. Будь ласка, "
+"вкажіть спочатку ваше ім'я користувача OSM в налаштуваннях.</em></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
+msgid "<html>Download my open changesets</html>"
+msgstr "<html>Завантажити мої відкриті набори змін</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:165
+msgid ""
+"<html>Download changesets in the current map view.<br><em>Disabled. There is "
+"currently no map view active.</em></html>"
+msgstr ""
+"<html>Завантажити набори змін до поточного виду мапи.<br><em>Відключено. На "
+"даний момент немає активного виду мапи.</em></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
+msgid "<html>Download changesets in the current map view</html>"
+msgstr "<html>завантажити набори змін у поточний вид мапи</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
+#, java-format
+msgid ""
+"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
+"default query."
+msgstr ""
+"Увага: неочікуване значення для налаштування ''{0}'', отримано ''{1}''. "
+"Скидання до типового запиту."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:172
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:133
+msgid "Basic"
+msgstr "Базовий"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
+msgid "Download changesets using predefined queries"
+msgstr "Завантажити набори змін з використанням заданих запитів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
+msgid "From URL"
+msgstr "Із URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
+msgid "Query changesets from a server URL"
+msgstr "Запитати набори змін з сервера за URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:132
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
+msgid "Advanced"
+msgstr "Розширений"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
+msgid "Use a custom changeset query"
+msgstr "Використовувати запит користувача для отримання набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
+msgid "Query changesets"
+msgstr "Запит для отримання набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
+msgid "Query and download changesets"
+msgstr "Запитати та завантажити з сервера набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
+msgid "Please enter a valid changeset query URL first."
+msgstr "Будь ласка, введіть в першу чергу дійсний URL запиту набору змін."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
+msgid "Illegal changeset query URL"
+msgstr "Недійсний URL запиту для отримання набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
+msgid "Close the dialog and abort querying of changesets"
+msgstr "Закрити діалог і припинити запит на отримання наборів змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:71
+msgid "Querying and downloading changesets"
+msgstr "Запитування та завантаження наборів змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
+msgid "Determine user id for current user..."
+msgstr "Визначення ідентифікатора для поточного користувача…"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
+msgid "Query and download changesets ..."
+msgstr "Запитати та завантажити набір змін…"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
+msgid "URL: "
+msgstr "URL: "
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
+msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
+msgstr ""
+"Будь ласка, введіть або вставте URL, щоб отримати набори змін від OSM API."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
+msgid "Examples"
+msgstr "Приклади"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
+#, java-format
+msgid ""
+"Note that changeset queries are currently always submitted to ''{0}'', "
+"regardless of the host, port and path of the URL entered below."
+msgstr ""
+"Зверніть увагу, що запити наборів змін у цей час завжди надсилаються до "
+"''{0}'', незалежно від хосту, порту та шляху URL, введених нижче."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
+msgid "This changeset query URL is invalid"
+msgstr "Недійсний URL запиту отримання набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:186
+#, java-format
+msgid "This will change {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Це змінить {0} об’єкт."
+msgstr[1] "Це змінить {0} об’єкти."
+msgstr[2] "Це змінить {0} об’єктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:188
+msgid "An empty value deletes the tag."
+msgstr "Пусте значення вилучає теґ."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:237
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:282
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:498
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:562
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
+msgid "<different>"
+msgstr "<інший>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:251
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:393
+msgid "Change values?"
+msgstr "Змінити значення?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:311
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Зміна властивостей {0} об’єкта"
+msgstr[1] "Зміна властивостей {0} об’єктів"
+msgstr[2] "Зміна властивостей {0} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:351
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Це змінить до {0} об'єкта."
+msgstr[1] "Це змінить до {0} об'єктів."
+msgstr[2] "Це змінить до {0} об'єктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:353
+msgid "Please select a key"
+msgstr "Будь ласка, оберіть ключ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:378
+msgid "Please select a value"
+msgstr "Будь ласка, оберіть значення"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:473
+msgid "Please select the objects you want to change properties for."
+msgstr "Будь ласка, оберіть об'єкти для зміни параметрів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:480
+msgid "Properties/Memberships"
+msgstr "Параметри/Членство"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:479
+msgid "Properties for selected objects."
+msgstr "Параметри обраних об'єктів."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:513
+msgid "Member Of"
+msgstr "Член групи"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:612
+msgid "Add Properties"
+msgstr "Додати параметри"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
+#, java-format
+msgid "Properties: {0} / Memberships: {1}"
+msgstr "Параметрів: {0} / Членів: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
+msgid "Properties / Memberships"
+msgstr "Параметри / Члени"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
+msgid "Change relation"
+msgstr "Змінити зв’язок"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+msgid "Delete from relation"
+msgstr "Вилучити із зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#, java-format
+msgid "Really delete selection from relation {0}?"
+msgstr "Справді стерти обране зі зв’язку {0}?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
+msgid "Delete the selected key in all objects"
+msgstr "Вилучити обраний ключ зі всіх об'єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+msgid "Delete Properties"
+msgstr "Вилучити параметри"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
+msgid "Add a new key/value pair to all objects"
+msgstr "Додати нову пару ключ/значення до всіх об'єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
+msgid "Edit the value of the selected key for all objects"
+msgstr "Правити значення обраного ключа для всіх об'єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
+msgid "Select relation"
+msgstr "Вибрати зв’язок"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
+msgid "Select relation in main selection."
+msgstr "Вибрати зв’язок із основного виділення"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+msgid "Select in relation list"
+msgstr "Вибрати зі списку зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
+msgid "Select relation in relation list."
+msgstr "Вибрати зв’язок зі списку зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:177
+msgid "Edit the relation the currently selected relation member refers to."
+msgstr ""
+"Редагувати зв’язок, до якого належить виділений у поточний момент член."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:220
+msgid "Download all child relations (recursively)"
+msgstr "Завантажити усіх нащадків зв’язків (рекурсивно)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:222
+msgid "Download All Children"
+msgstr "Звантаження усіх нащадків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:241
+msgid "Download selected relations"
+msgstr "Завантажити виділені зв’язки"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:245
+msgid "Download Selected Children"
+msgstr "Завантажити виділених нащадків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:290
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:439
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:42
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:49
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:64
+msgid "Download relation members"
+msgstr "Завантажити членів зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:477
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:614
+msgid "Conflict in data"
+msgid_plural "Conflicts in data"
+msgstr[0] "Конфлікт в даних"
+msgstr[1] "Конфлікти в даних"
+msgstr[2] "Конфліктів у даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:344
+#, java-format
+msgid ""
+"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
+"loaded"
+msgstr ""
+"<html>Нащадка зв’язку<br>{0}<br>вилучено з сервера. Його не можливо "
+"завантажити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:353
+msgid "Relation is deleted"
+msgstr "Зв’язок вилучено"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:503
+#, java-format
+msgid "Downloading relation {0}"
+msgstr "Завантаження зв’язку {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:420
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:513
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:139
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:109
+#, java-format
+msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+"Попередження: помилку проігноровано тому що завдання скасовано. Помилка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:93
+#, java-format
+msgid "Downloading {0} incomplete child of relation ''{1}''"
+msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
+msgstr[0] "Завантажується {0} неповний нащадок зв’язку ''{1}''"
+msgstr[1] "Завантажуються {0} неповних нащадка зв’язку ''{1}''"
+msgstr[2] "Завантажуються {0} неповних нащадків зв’язку ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:100
+#, java-format
+msgid "Downloading {0} incomplete child of {1} parent relations"
+msgid_plural "Downloading {0} incomplete children of  {1} parent relations"
+msgstr[0] "Завантажується {0} неповний нащадок з {1} батьківських зв’язків"
+msgstr[1] "Завантажуються {0} неповних нащадки з {1} батьківських зв’язків"
+msgstr[2] "Завантажуються {0} неповних нащадків з {1} батьківських зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
+msgid "Download relations"
+msgstr "Завантажити зв’язки"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
+#, java-format
+msgid "({0}/{1}): Downloading relation ''{2}''..."
+msgstr "({0}/{1}): Завантаження зв’язку ''{2}''…"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149
+msgid "Tags and Members"
+msgstr "Теґи та члени"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:151
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+msgid "Parent Relations"
+msgstr "Батьківські зв’язки"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
+msgid "Child Relations"
+msgstr "Нащадки зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
+msgid "Apply Role:"
+msgstr "Застосувати роль:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
+msgid "Enter a role and apply it to the selected relation members"
+msgstr "Ввести роль та застосувати її до виділених членів зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:571
+msgid ""
+"<html>There is at least one member in this relation referring<br>to the "
+"relation itself.<br>This creates circular dependencies and is discouraged."
+"<br>How do you want to proceed with circular dependencies?</html>"
+msgstr ""
+"<html>Існує принаймні один член цього зв’язку,<br>що посилається сам на себе."
+"<br>Це створює циклічну залежність і не рекомендується.<br>Що робити із "
+"циклічними залежностями?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
+msgid "Remove them, clean up relation"
+msgstr "Вилучити їх із зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:578
+msgid "Ignore them, leave relation as is"
+msgstr "Ігнорувати, залишити зв'язок як є"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:601
+#, java-format
+msgid ""
+"<html>This relation already has one or more members referring to<br>the "
+"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
+"html>"
+msgstr ""
+"<html>В цьому зв’язку вже є один чи декілька членів, що посилаються "
+"на<br>елемент ''{0}''<br><br>Ви дійсно хочете додати ще одного члена зв’язку?"
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:611
+msgid "Multiple members referring to same primitive"
+msgstr "Кілька членів посилаються на один і той же елемент"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:629
+#, java-format
+msgid ""
+"<html>You are trying to add a relation to itself.<br><br>This creates "
+"circular references and is therefore discouraged.<br>Skipping relation "
+"''{0}''.</html>"
+msgstr ""
+"<html>Ви намагаєтесь додати зв’язок самого до себе.<br><br>Це створить "
+"циклічне посилання і тому не рекомендується.<br>Пропустити зв’язок ''{0}''.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:670
+msgid ""
+"Add all primitives selected in the current dataset before the first member"
+msgstr ""
+"Додати всі елементи, виділені в поточному наборі даних, перед першим членом"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:696
+msgid ""
+"Add all primitives selected in the current dataset after the last member"
+msgstr ""
+"Додати всі елементи, виділені в поточному наборі даних, після останнього "
+"члена"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:723
+msgid ""
+"Add all primitives selected in the current dataset before the first selected "
+"member"
+msgstr ""
+"Додати всі елементи, виділені в поточному наборі даних, перед першим "
+"виділеним членом"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:757
+msgid ""
+"Add all primitives selected in the current dataset after the last selected "
+"member"
+msgstr ""
+"Додати всі елементи, виділені в поточному наборі даних, після останнього "
+"виділеного члена"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:789
+msgid "Remove all members referring to one of the selected primitives"
+msgstr "Вилучити всіх членів, що відносяться до любого з виділених елементів"
+
+#. putValue(NAME, tr("Remove Selected"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792
+msgid "Relation Editor: Remove Selected"
+msgstr "Редактор зв’язків: Вилучити виділене"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:826
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:838
+msgid ""
+"Select relation members which refer to primitives in the current selection"
+msgstr "Виділити членів зв’язку, які відносяться до вибраних елементів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:836
+#, java-format
+msgid ""
+"Select relation members which refer to {0} primitives in the current "
+"selection"
+msgstr ""
+"Виділити членів зв’язку, які відносяться до {0} елем. серед виділених "
+"елементів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:860
+msgid "Select primitives for selected relation members"
+msgstr "Виділити елементи для виділених членів зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:880
+msgid "Sort the relation members"
+msgstr "Впорядкувати членів зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:882
+msgid "Sort"
+msgstr "Впорядкувати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
+msgid "Relation Editor: Sort"
+msgstr "Редактор зв’язків: Впорядкувати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:903
+msgid "Reverse the order of the relation members"
+msgstr "Змінити порядок членів зв’язку на протилежний"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:905
+msgid "Reverse"
+msgstr "У зворотному порядку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
+msgid "Relation Editor: Reverse"
+msgstr "Редактор зв’язків: Навпаки"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:926
+msgid "Move the currently selected members up"
+msgstr "Перемістити обраних членів вгору"
+
+#. putValue(NAME, tr("Move Up"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:929
+msgid "Relation Editor: Move Up"
+msgstr "Редактор зв’язків: Підняти"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:945
+msgid "Move the currently selected members down"
+msgstr "Перемістити обраних членів вниз"
+
+#. putValue(NAME, tr("Move Down"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:948
+msgid "Relation Editor: Move Down"
+msgstr "Редактор зв’язків: Опустити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+msgid "Remove the currently selected members from this relation"
+msgstr "Вилучити виділених членів зі зв’язку"
+
+#. putValue(NAME, tr("Remove"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:967
+msgid "Relation Editor: Remove"
+msgstr "Редактор зв’язків: Вилучити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:983
+msgid "Delete the currently edited relation"
+msgstr "Вилучити зв’язок, що редагується"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1030
+msgid ""
+"One or more members of this new relation have been deleted while the "
+"relation editor\n"
+"was open. They have been removed from the relation members list."
+msgstr ""
+"Один або більше членів цього нового зв’язку були вилучені, коли редактор "
+"зв’язків\n"
+"був відкритий. Вони були вилучені зі списку членів зв’язку."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1083
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:595
+msgid "Yes, create a conflict and close"
+msgstr "Так, створити конфлікт і закрити"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1085
+msgid "Click to create a conflict and close this relation editor"
+msgstr "Натисніть, щоб створити конфлікт і закрити редактор зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1089
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:601
+msgid "No, continue editing"
+msgstr "Ні, продовжити редагування"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
+msgid "Click to return to the relation editor and to resume relation editing"
+msgstr ""
+"Клацніть аби повернутися до редактора зв’язків та продовжити редагування"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1098
+msgid ""
+"<html>This relation has been changed outside of the editor.<br>You cannot "
+"apply your changes and continue editing.<br><br>Do you want to create a "
+"conflict and close the editor?</html>"
+msgstr ""
+"<html>Цей зв’язок було змінено поза межами редактора<br>Ви не можете "
+"зберегти свої зміни та продовжити редагування.<br><br>Бажаєте позначити як "
+"конфлікт та закрити редактор?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1115
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
+"<br>Please resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>Шар ''{0}'' має конфлікт для елементу<br>''{1}''.<br>Будь ласка "
+"розв’яжіть конфлікти, а потім спробуйте ще раз.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1129
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:641
+msgid "Apply the current updates"
+msgstr "Застосувати поточні оновлення"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1162
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:684
+msgid "Apply the updates and close the dialog"
+msgstr "Застосувати оновлення і закрити діалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1196
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:738
+msgid "Cancel the updates and close the dialog"
+msgstr "Скасувати оновлення та закрити діалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1213
+msgid "Add an empty tag"
+msgstr "Додати порожній теґ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+msgid "Download all incomplete members"
+msgstr "Завантажити усіх неповних членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1261
+msgid "Download Members"
+msgstr "Завантажити членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1262
+msgid "Relation Editor: Download Members"
+msgstr "Редактор зв’язків: Завантажити членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1259
+msgid "Download selected incomplete members"
+msgstr "Завантажити виділених неповних членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1296
+msgid "Sets a role for the selected members"
+msgstr "Встановити роль для виділених членів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1298
+msgid "Apply Role"
+msgstr "Застосувати роль"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
+#, java-format
+msgid "You are setting an empty role on {0} primitive."
+msgid_plural "You are setting an empty role on {0} primitives."
+msgstr[0] "Ви призначити пусту роль {0} елементу."
+msgstr[1] "Ви призначити пусту роль {0} елементам."
+msgstr[2] "Ви призначити пусту роль {0} елементам."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315
+msgid "This is equal to deleting the roles of these primitives."
+msgstr "Це дорівнює вилученю ролі цих елементів."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
+msgid "Do you really want to apply the new role?"
+msgstr "Ви дійсно бажаєте, застосувати нову роль?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+msgid "Yes, apply it"
+msgstr "Так, застосовувати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
+msgid "No, do not apply"
+msgstr "Ні, не застосовувати"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1326
+msgid "Confirm empty role"
+msgstr "Підтвердити порожню роль"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1394
+msgid "Edit the relation the currently selected relation member refers to"
+msgstr "Виділений, при редагуванні зв’язку, член відноситься до"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:191
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:809
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:388
+msgid "Zoom to"
+msgstr "Збільшити до"
+
+#: ../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:212
+msgid "Zooming disabled because layer of this relation is not active"
+msgstr "Масштабування скасовано, тому що шар цього зв’язку не активний"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217
+msgid "Zooming disabled because there is no selected member"
+msgstr "Масштабування скасовано, тому що ви не вибрали члена"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java:27
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java:29
+msgid "Refers to"
+msgstr "Посилається на"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:76
+msgid "Download referring relations"
+msgstr "Завантажит зв’язки з посиланнями"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:186
+#, java-format
+msgid "There were {0} conflicts during import."
+msgstr "Підчас імпорту виникло {0} конфлітів"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:194
+#, java-format
+msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
+msgstr ""
+"Попередження: Виключення проігноровано, оскільки завдання скасовується. "
+"Помилка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
+msgid "including immediate children of parent relations"
+msgstr "в тому числі безпосередні нащадки батьківських зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
+msgid "Load parent relations"
+msgstr "Завантажити батьківські зв’язки"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
+msgid "Loading parent relations"
+msgstr "Завантаження батьківських зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
+msgid "Edit the currently selected relation"
+msgstr "Правити поточний зв’язок"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
+msgid "Apply Changes"
+msgstr "Застосувати зміни"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:133
+#, java-format
+msgid "Create new relation in layer ''{0}''"
+msgstr "Створити новий зв’язок у шарі ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:135
+#, java-format
+msgid "Edit new relation in layer ''{0}''"
+msgstr "Правити новий зв’язок у шарі ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:137
+#, java-format
+msgid "Edit relation #{0} in layer ''{1}''"
+msgstr "Створити зв’язок #{0} у шарі ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:116
+msgid "Load relation"
+msgstr "Завантажити зв’язок"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:162
+#, java-format
+msgid ""
+"Warning: ignoring exception because task was cancelled. Exception was: {0}"
+msgstr ""
+"Попередження: ігнорування винятку, оскільки завдання було скасовано. "
+"Виняток: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:70
+msgid "way is connected"
+msgstr "лінія з’єднана"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
+msgid "way is connected to previous relation member"
+msgstr "лінія з'єднана з попереднім членом зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:74
+msgid "way is connected to next relation member"
+msgstr "лінія з'єднана з наступним членом зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:76
+msgid "way is not connected to previous or next relation member"
+msgstr "лінія не з'єднана ні з попереднім, ні з наступним членом зв’язку"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
+msgid "Bookmarks"
+msgstr "Закладки"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
+msgid "<html>There is currently no download area selected.</html>"
+msgstr ""
+"<html>На даний момент не обрана ділянка для завантаження з сервера.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+"<html><strong>Поточна ділянка для завантаження з сервера</strong> (мін.дов, "
+"мін.шир, макс.дов, макс.шир): </html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
+msgid "Create bookmark"
+msgstr "Створити закладку"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
+msgid "Add a bookmark for the currently selected download area"
+msgstr "Додати закладку для завантаження вибраної ділянки"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
+msgid ""
+"Currently, there is no download area selected. Please select an area first."
+msgstr ""
+"В даний час немає жодної вибраної ділянки для завантаження. Будь ласка, "
+"виберіть ділянку."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253
+msgid "Please enter a name for the bookmarked download area."
+msgstr "Будь ласка, введіть ім'я закладки для ділянки."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:254
+msgid "Name of location"
+msgstr "Назва місцевості"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
+msgid "Remove the currently selected bookmarks"
+msgstr "Вилучити вибрані закладки"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
+msgid "Rename the currently selected bookmark"
+msgstr "Перейменувати вибрану закладку"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
+msgid "min lat"
+msgstr "мін. шир."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
+msgid "min lon"
+msgstr "мін. довг."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:108
+msgid "max lat"
+msgstr "макс. шир."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+msgid "max lon"
+msgstr "макс. довг."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
+msgid ""
+"URL from www.openstreetmap.org (you can paste an URL here to download the "
+"area)"
+msgstr ""
+"Адреса з www.openstreetmap.org (ви можете вставити URL сюди для завантаження "
+"ділянки)"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
+msgid "Bounding Box"
+msgstr "Габаритний прямокутник"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:251
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
+#, java-format
+msgid "The string ''{0}'' is not a valid double value."
+msgstr "Рядок ''{0}''не є правильним подвійним значенням."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:164
+msgid "Value for latitude in range [-90,90] required."
+msgstr "Значення широти має бути в межах [-90,90]."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:255
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:204
+msgid "Value for longitude in range [-180,180] required."
+msgstr "Значення довготи має бути в межах [-180,180]."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:294
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:235
+msgid "Paste URL from clipboard"
+msgstr "Вставити URL з буфера обміну"
+
+#. adding the download tasks
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:97
+msgid "Data Sources and Types:"
+msgstr "Джерела і типи даних:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
+msgid "OpenStreetMap data"
+msgstr "Дані OpenStreetMap"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99
+msgid "Select to download OSM data in the selected download area."
+msgstr "Позначте, щоб завантажити з сервера OSM дані, для виділеної ділянки"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:101
+msgid "Raw GPS data"
+msgstr "Дані GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:102
+msgid "Select to download GPS traces in the selected download area."
+msgstr "Позначте, щоб завантажити з сервера GPS-треки, для виділеної ділянки"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:133
+msgid "Download as new layer"
+msgstr "Завантажити як новий шар"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:134
+msgid ""
+"<html>Select to download data into a new data layer.<br>Unselect to download "
+"into the currently active data layer.</html>"
+msgstr ""
+"<html>Позначте, щоб завантажити дані в новий шар даних.<br>Зніміть позначку, "
+"щоб завантажити дані у поточний активний шар.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+msgid "No area selected yet"
+msgstr "Ділянку досі не вибрано"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
+msgid "Download area too large; will probably be rejected by server"
+msgstr "Ділянка для завантаження надто велика; можлива відмова від сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
+msgid "Download area ok, size probably acceptable to server"
+msgstr "Розмір ділянки для завантаження прийнятний для сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:378
+msgid "Click to close the dialog and to abort downloading"
+msgstr "Натисніть, щоб закрити діалог та припинити завантаження"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:395
+msgid "Click do download the currently selected area"
+msgstr "Натисніть, щоб завантажити позначену ділянку"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:402
+msgid "Please select a download area first."
+msgstr "Будь ласка, виберіть спочатку ділянку для завантаження"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:411
+#, java-format
+msgid ""
+"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
+"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgstr ""
+"<html>Ні <strong>{0}</strong> ні <strong>{1}</strong> не можливо.<br>Будь "
+"ласка, виберіть чи завантажити дані OSM, чи дані GPX, або і перше і друге.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
+msgid "Class Type"
+msgstr "Тип класу"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
+msgid "Bounds"
+msgstr "Межі"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+msgid "Near"
+msgstr "Біля"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+msgctxt "placeselection"
+msgid "Zoom"
+msgstr "Масштаб"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:101
+msgid "Choose the server for searching:"
+msgstr "Виберіть пошуковий сервер:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
+msgid "Enter a place name to search for:"
+msgstr "Введіть назву місця для пошуку:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
+msgid "Enter a place name to search for"
+msgstr "Введіть назву місця для пошуку"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
+msgid "Areas around places"
+msgstr "Ділянки біля місця"
+
+#. SAXException does not chain correctly
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
+msgid "Null pointer exception, possibly some missing tags."
+msgstr "Порожній покажчик помилки, можливо є відсутні теґи"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
+msgid "Search ..."
+msgstr "Пошук…"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
+msgid "Click to start searching for places"
+msgstr "Натисніть, щоб почати пошук місць"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
+msgid "Querying name server"
+msgstr "Запит до сервера імен"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
+msgid "Querying name server ..."
+msgstr "Запит до сервера імен…"
+
+#. item "Highways/Streets/Roundabout" label "Edit Junction"
+#. <space />
+#. <key key="junction" value="roundabout" />
+#. item "Waypoints/Pedestrian Crossing" label "Edit Crossing"
+#. <key key="highway" value="crossing" />
+#. item "Waypoints/Traffic Calming" label "Edit Traffic Calming"
+#. item "Water/Water/Wetland" text "Name"
+#. item "Car/Parking" text "Reference number"
+#. item "Man Made/Pipeline" text "Operator"
+#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Power Generator" label "Edit Power Generator"
+#. <key key="power" value="generator" />
+#. item "Man Made/Power Tower" label "Edit Power Tower"
+#. item "Land use/Tree" text "Name"
+#. item "Land use/Wood" text "Name"
+#. item "Land use/Forest" text "Name"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
+msgid "Type"
+msgstr "Тип"
+
+#. item "Ways/Path" combo "Wheelchairs"
+#. item "Ways/Dedicated Cycleway" combo "Pedestrians"
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:43
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:56
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:140
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:281
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:408
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+msgid "unknown"
+msgstr "Невідомо"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:37
+msgid "Slippy map"
+msgstr "Рухлива мапа"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/TileSelection.java:37
+msgid "Tile Numbers"
+msgstr "Номери Клітинок"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
+#, java-format
+msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
+msgstr "Не вдалося прочитати файл CSS ''help-browser.css''. Помилка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
+msgid "JOSM Help Browser"
+msgstr "Оглядач довідки JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
+#, java-format
+msgid ""
+"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
+"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
+"is not available yet. It is missing both in your local language ({1}) and in "
+"english.<br><br>Please help to improve the JOSM help system and fill in the "
+"missing information. You can both edit the <a href=\"{2}\">help topic in "
+"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
+"a>.</p></html>"
+msgstr ""
+"<html><p class=\"warning-header\">Відсутній вміст розділу довідки</p><p "
+"class=\"warning-body\">Вміст довідки для розділу довідки <strong>{0}</"
+"strong> ще не написано. Варіант мовою ({1}) та англомовний варіанти поки "
+"відсутні.<br><br>Будь ласка, допоможіть покращити довідкову систему JOSM та "
+"додайте відсутню інформацію. Ви можете виправити розділ довідки, <a href="
+"\"{2}\">вашою мовою ({1})</a> та — <a href=\"{3}\">розділ англійською</a>.</"
+"p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
+#, java-format
+msgid ""
+"<html><p class=\"error-header\">Error when retrieving help information</p><p "
+"class=\"error-body\">The content for the help topic <strong>{0}</strong> "
+"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
+"p></html>"
+msgstr ""
+"<html><p class=\"error-header\">Сталася помилка під час отримання довідкової "
+"інформації</p><p class=\"error-body\">Неможливо завантажити вміст довідкової "
+"статті <strong>{0}</strong>. Повідомлення про помилку (не перекладено):"
+"<br><tt>{1}</tt></p></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
+#, java-format
+msgid ""
+"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
+"network problem, please check<br>your internet connection</html>"
+msgstr ""
+"<html>Не вдалося відкрити сторінку довідки для url {0}.<br>Це швидше за все "
+"відбулося через проблеми з мережею, будь ласка, перевірте<br>ваше з’єднання "
+"з інтернет</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
+msgid "Failed to open URL"
+msgstr "Не вдалося відкрити URL"
+
+#. putValue(NAME, tr("Open in Browser"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393
+msgid "Open the current help page in an external browser"
+msgstr "Відкрити поточну сторінку довідки в зовнішньому оглядачі"
+
+#. putValue(NAME, tr("Edit"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405
+msgid "Edit the current help page"
+msgstr "Правити поточну сторінку довідки"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
+#, java-format
+msgid ""
+"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
+"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
+msgstr ""
+"<html>Поточне посилання <tt>{0}</tt><br> — це зовнішнє посилання. Можливо "
+"правити тільки статті довідки <br>на сервері довідки<tt>{1}</tt>.</html>"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:437
+msgid "Reload the current help page"
+msgstr "Перезавантажити поточну сторінку довідки"
+
+#. putValue(NAME, tr("Back"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:452
+msgid "Go to the previous page"
+msgstr "Перейти до попередньої сторінки"
+
+#. putValue(NAME, tr("Forward"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:472
+msgid "Go to the next page"
+msgstr "Перейти до наступної сторінки"
+
+#. putValue(NAME, tr("Home"));
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:488
+msgid "Go to the JOSM help home page"
+msgstr "Перейти до початкової сторінки довідки JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:519
+#, java-format
+msgid "Warning: bad location in HTML document. Exception was: {0}"
+msgstr "Попередження: невірне розташування в документі HTML. Помилка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569
+msgid "Failed to open help page. The target URL is empty."
+msgstr "Не вдалося відкрити сторінку довідки. Цільовий URL порожній."
+
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:570
+msgid "Failed to open help page"
+msgstr "Не вдалося відкрити сторінку довідки."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:180
+msgid "Latitude: "
+msgstr "Широта: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:198
+msgid "Longitude: "
+msgstr "Довгота: "
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
+msgid "Coordinates"
+msgstr "Координати"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
+#, java-format
+msgid "History for node {0}"
+msgstr "Історія точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
+#, java-format
+msgid "History for way {0}"
+msgstr "Історія лінії {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
+#, java-format
+msgid "History for relation {0}"
+msgstr "Історія зв’язку {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149
+msgid "Reload the history from the server"
+msgstr "Перезавантажити історії з сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
+msgid "History not initialized yet. Failed to set reference primitive."
+msgstr "Історію ще не ініціалізовано. Не вдалося встановити посилання елемент."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
+#, java-format
+msgid ""
+"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgstr ""
+"Не вдалося встановити посилання. Ідентифікатор посилання {0} не відповідає "
+"ідентифікатору історії {1}."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
+#, java-format
+msgid ""
+"Failed to set reference. Reference version {0} not available in history."
+msgstr "Не вдалося встановити посилання. номер версії {0} відсутній в історії."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
+msgid "History not initialized yet. Failed to set current primitive."
+msgstr "Історію ще не ініціалізовано. Помилка налаштування поточного елемента."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
+#, java-format
+msgid ""
+"Failed to set current primitive. Current version {0} not available in "
+"history."
+msgstr ""
+"Помилка налаштування поточного елемента. Поточна версія {0} не доступна в "
+"історії."
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:67
+msgid "Load history"
+msgstr "Завантажити історію"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:186
+#, java-format
+msgid "Loading history for node {0}"
+msgstr "Завантаження історії для точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
+#, java-format
+msgid "Loading history for way {0}"
+msgstr "Завантаження історії для лінії {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
+#, java-format
+msgid "Loading history for relation {0}"
+msgstr "Завантаження історії для зв’язку {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:77
+#, java-format
+msgid "Node {0}"
+msgstr "Точка {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
+msgid "Zoom to node"
+msgstr "Наблизитись до точки"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
+msgid "Zoom to this node in the current data layer"
+msgstr "Наблизитись до цієї точки в поточному шарі"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
+msgid "Open a history browser with the history of this node"
+msgstr "Відкрити історію цієї точки в оглядачі історії"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:78
+#, java-format
+msgid "Way {0}"
+msgstr "Лінія {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Relation {0}"
+msgstr "Зв’язок {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36
+#: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
+msgid "not present"
+msgstr "відсутній"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:56
+msgid "Changeset"
+msgstr "Набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgstr ""
+"<html>Версію <strong>{0}</strong> в поточний момент змінено в шарі ''{1}''</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
+#, java-format
+msgid ""
+"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgstr ""
+"<html>Версію <strong>{0}</strong> створено у <strong>{1}</strong></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
+msgid "Changeset info"
+msgstr "Інформація набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
+msgid "Launch browser with information about the changeset"
+msgstr "Запустити оглядач з інформацією про набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139
+#, java-format
+msgid "Show changeset {0}"
+msgstr "Показати набір змін {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:63
+#, java-format
+msgid "Version {0}, {1} (by {2})"
+msgstr "Версія {0}, {1} (з {2})"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:79
+#, java-format
+msgid "Version {0} created on {1} by {2}"
+msgstr "Версія {0} створена: {1}, {2}"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:107
+#, java-format
+msgid "Version {0} in editor"
+msgstr "Версія {0} в редакторі"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:109
+msgid "[deleted]"
+msgstr "[вилучено]"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:119
+#, java-format
+msgid "Version {0} currently edited in data layer ''{1}''"
+msgstr "Версію {0} в поточний момент виправлено в шарі даних ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
+msgid "Version"
+msgstr "Версія"
+
+#: ../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 ""
+"Не вдалося оновити елемент з ідентифікатором {0}, тому що поточний шар, що "
+"редагується, порожній"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
+#, java-format
+msgid ""
+"Failed to update primitive with id {0} because current edit layer does not "
+"include such a primitive"
+msgstr ""
+"Не вдалося оновити елемент з ідентифікатором {0}, тому що поточний шар не "
+"містить такий елемент"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
+#, java-format
+msgid "Synchronize node {0} only"
+msgstr "Синхронізувати лише точку {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:95
+#, java-format
+msgid "Synchronize way {0} only"
+msgstr "Синхронізувати лише лінію {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:96
+#, java-format
+msgid "Synchronize relation {0} only"
+msgstr "Синхронізувати лише зв’язок {0}"
+
+#: ../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 "Синхронізувати весь набір даних"
+
+#: ../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>Надсилання на сервер <strong>не вдалося<strong> так як на сервері є "
+"більш нова версія однієї<br>з ваших точок, ліній або зв’язку.<br>Причиною "
+"конфлікту є <strong>{0}</strong> з ід. <strong>{1}</strong>,<br>версія даних "
+"на сервері {2}, ваша версія {3}.<br><br>Натисніть <strong>{4}</strong>, щоб "
+"синхронізувати тільки конфліктний елемент.<br>Натисніть <strong>{5}</"
+"strong>, щоб синхронізувати весь локальний набір даних з сервером."
+"<br>Натисніть <strong>{6}</strong>, щоб перервати надсилання та продовжити "
+"редагування.<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:393
+msgid "Conflicts detected"
+msgstr "Виявлено конфлікт"
+
+#: ../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><strong>Надсилання на сервер <strong>не вдалося<strong> так як на "
+"сервері є більш нова версія однієї<br>з ваших точок, ліній або зв’язку."
+"<br><br>Натисніть <strong>{0}</strong> для синхронізації локальних даних з "
+"сервером. <br> Натисніть <strong>{1}</strong> щоб перервати надсилання та "
+"продовжити редагування..<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
+#, java-format
+msgid ""
+"<html>Uploading <strong>failed</strong> because you have 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>Надсилання на сервер <strong>не вдалась</strong> тому що ви "
+"використовуєте<br>набір змін {0}, який вже був закритий {1}.<br>Будь ласка, "
+"надішліть знову з новим або існуючим відкритим набором змін.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
+msgid "Changeset closed"
+msgstr "Набір змін закрито"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214
+msgid "Prepare conflict resolution"
+msgstr "Підготувати розв’язання конфлікту"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:216
+#, java-format
+msgid "Click to download all parent ways for node {0}"
+msgstr "Клацніть, щоб завантажити всі батьківські лінії точки {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222
+msgid "Click to cancel and to resume editing the map"
+msgstr "Клацніть, щоб скасувати і повернутися до редагування ммапи"
+
+#: ../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>Надсилання на сервер <strong>не вдалась</strong>, тому що ви "
+"намагались вилучити точку {0}, яка ще використовується в лінії {1}."
+"<br><br>Натисніть <strong>{2}</strong>, щоб завантажити з сервера всі "
+"батьківські лінії точки {0}.<br>Якщо потрібно, JOSM створить конфлікти, які "
+"потім зможете врегулювати у вікні розв’язання конфліктів.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
+msgid "Node still in use"
+msgstr "Точка ще використовується"
+
+#: ../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 ""
+"Попередження: помилка в заголовку \"{0}\" не відповідає очікуваному шаблону"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:48
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Напишіть короткий пояснення для змін, які ви завантажуєте:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java:50
+msgid "Enter an upload comment (min. 3 characters)"
+msgstr "Введіть коментар для даних, що надсилаються на сервер (мін. 3 знаки)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:34
+msgid "Changeset id:"
+msgstr "Набір змін:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+msgid "Created at:"
+msgstr "Створено в:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+msgid "Changeset comment:"
+msgstr "Коментра набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Немає відкритого набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:80
+msgid ""
+"Please decide what changeset the data is uploaded to and whether to close "
+"the changeset after the next upload."
+msgstr ""
+"Будь ласка, вирішите, який набір змін даних надсилається і чи варто закрити "
+"набір змін після чергового надсилання на сервер."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:89
+msgid "Upload to a new changeset"
+msgstr "Надіслати у новий набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:90
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+"Відкрийте новий набір змін і використовувати його під час наступного "
+"надсилання"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:99
+msgid "Upload to an existing changeset"
+msgstr "Надіслати у існуючий набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:100
+msgid "Upload data to an already existing and open changeset"
+msgstr "Додати дані у вже існуючий та відкритий набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:111
+msgid "Select an open changeset"
+msgstr "Виберіть відкритий набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:145
+msgid "Close changeset after upload"
+msgstr "Закрити набір змін після надсилання"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:146
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+"Вибрати, який набір змін треба закрити, після наступного надсилання даних"
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:309
+msgid "Load the list of your open changesets from the server"
+msgstr "Завантажте список ваших відкритих наборів змін з сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:327
+msgid "Close the currently selected open changeset"
+msgstr "Закрити вибраний поточний відкритий набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "<html>Будь ласка, виберіть набори змін, які ви бажаєте закрити</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
+msgid "Open changesets"
+msgstr "Відкриті набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
+msgid "Close changesets"
+msgstr "Закрити набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121
+msgid "Close the selected open changesets"
+msgstr "Закрити вибрані відкриті набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144
+msgid "Cancel closing of changesets"
+msgstr "Скасування закриття наборів змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38
+msgid "Closing changeset"
+msgstr "Закриття набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76
+#, java-format
+msgid "Closing changeset {0}"
+msgstr "Закриття набору змін {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
+msgid ""
+"Warning: failed to put Credential Dialog always on top. Caught security "
+"exception."
+msgstr ""
+"Попередження: не вдалося утримати діалог облікових даних завжди поверх "
+"вікон. Виявлена помилка безпеки."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
+msgid "Enter credentials for OSM API"
+msgstr "Введіть облікові дані для OSM API"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112
+msgid "Enter credentials for HTTP proxy"
+msgstr "Введіть облікові дані для проксі HTTP"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145
+msgid "Save user and password (unencrypted)"
+msgstr "Зберегти логін і пароль (незашифрованими)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
+msgid "Please enter the user name of your OSM account"
+msgstr "Будь ласка, введіть ім'я користувача для вашого облікового запису OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
+msgid "Please enter the password of your OSM account"
+msgstr "Будь ласка, введіть ваш пароль до облікового запису OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
+#, java-format
+msgid ""
+"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
+"and a valid password."
+msgstr ""
+"Збій автентифікації у OSM API ''{0}''. Будь ласка, введіть правильне ім'я "
+"користувача і правильний пароль."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
+msgid "Warning: The password is transferred unencrypted."
+msgstr "Увага: Пароль передається незашифрованим."
+
+#: ../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 ""
+"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
+"username and a valid password."
+msgstr ""
+"Збій автентифікації на HTTP-проксі ''{0}''. Будь ласка, введіть правильне "
+"ім'я користувача і правильний пароль."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
+msgid ""
+"Warning: depending on the authentication method the proxy server uses the "
+"password may be transferred unencrypted."
+msgstr ""
+"Попередження: в залежності від методу автентифікації, пароль, який "
+"використовує проксі-сервер, може бути переданий в незашифрованому вигляді."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
+msgid "Authenticate"
+msgstr "Автентифікація"
+
+#: ../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
+msgid "Cancel authentication"
+msgstr "Скасування автентифікації"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
+msgid ""
+"Could not retrieve the list of your open changesets because<br>JOSM does not "
+"know your identity.<br>You have either chosen to work anonymously or you are "
+"not entitled<br>to know the identity of the user on whose behalf you are "
+"working."
+msgstr ""
+"Не вдалося отримати ваш список відкритих наборів змін, оскільки<br>JOSM не "
+"ідентифікував вас.<br>Або ви працюєте анонімно, або вам не "
+"дозволено<br>ідентифікувати користувача, від імені якого ви працюєте."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
+msgid "Missing user identity"
+msgstr "Ідентифікації користувача відсутня"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:120
+#, java-format
+msgid ""
+"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
+"was: {0}"
+msgstr ""
+"Попередження: Не вдалося отримати інформацію про поточного користувача JOSM. "
+"Помилка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:925
+msgid "Launch a file chooser to select a file"
+msgstr "Відкрити діалог вибору файлу"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
+msgid "Select filename"
+msgstr "Виберіть ім'я файлу"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
+msgid "No"
+msgstr "Ні"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
+#, java-format
+msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
+msgstr "В шарі ''{0}'' є зміни, які потрібно надіслати на сервер."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
+#, java-format
+msgid "Layer ''{0}'' has no modifications to be uploaded."
+msgstr "В шарі ''{0}'' немає змін, які потрібно надіслати на сервер."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
+#, java-format
+msgid ""
+"Layer ''{0}'' has modifications which should be saved to its associated file "
+"''{1}''."
+msgstr ""
+"Шар ''{0}'' містить зміни, які потрібно зберегти у відповідний файл ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
+#, java-format
+msgid "Layer ''{0}'' has no modifications to be saved."
+msgstr "Шар ''{0}'' не містить змін для збереження."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
+msgid "No file associated with this layer"
+msgstr "Немає файлу, пов'язаного з цим шаром"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83
+msgid "Please select a file"
+msgstr "Будь ласка, виберіть файл"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86
+#, java-format
+msgid "Layer ''{0}'' is not backed by a file"
+msgstr "Шар ''{0}'' поки ще не збережений у файлі"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
+#, java-format
+msgid "File ''{0}'' is not writable. Please enter another file name."
+msgstr ""
+"Не можливо записати у файл ''{0}''. Будь ласка, введіть інше ім'я файлу."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:115
+#, java-format
+msgid "Select to upload layer ''{0}'' to the server ''{1}''"
+msgstr "Вибрати, щоб завантажити шар ''{0}'' на сервер ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
+#, java-format
+msgid "Saving layer to ''{0}'' ..."
+msgstr "Збереження шару в ''{0}'' …"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+msgid "Unsaved changes - Save/Upload before exiting?"
+msgstr ""
+"Незбережені зміни — Зберегти локально або надіслати на сервер перед виходом?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+msgid "Unsaved changes - Save/Upload before deleting?"
+msgstr ""
+"Незбережені зміни — Зберегти локально або надіслати на сервер перед "
+"вилученням?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+msgid "Uploading and saving modified layers ..."
+msgstr "Надсилання на сервер та збереження змінених шарів…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#, java-format
+msgid ""
+"<html>{0} layer has unresolved conflicts.<br>Either resolve them first or "
+"discard the modifications.<br>Layer with conflicts:</html>"
+msgid_plural ""
+"<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
+"discard the modifications.<br>Layers with conflicts:</html>"
+msgstr[0] ""
+"<html>{0} шар містить не розв’язані конфлікти.<br>Або спочатку владнайте їх, "
+"або скасуйте зміни<br>Шар з конфліктами:</html>"
+msgstr[1] ""
+"<html>{0} шари містять не розв’язані конфлікти.<br>Або спочатку владнайте "
+"їх, або скасуйте зміни<br>Шари з конфліктами:</html>"
+msgstr[2] ""
+"<html>{0} шарів містять не розв’язані конфлікти.<br>Або спочатку владнайте "
+"їх, або скасуйте зміни<br>Шари з конфліктами:</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+msgid "Unsaved data and conflicts"
+msgstr "Незбережені дані і конфлікти"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#, java-format
+msgid ""
+"<html>{0} layer needs saving but has no associated file.<br>Either select a "
+"file for this layer or discard the changes.<br>Layer without a file:</html>"
+msgid_plural ""
+"<html>{0} layers need saving but have no associated file.<br>Either select a "
+"file for each of them or discard the changes.<br>Layers without a file:</"
+"html>"
+msgstr[0] ""
+"<html>{0} шар потрібно зберегти, але відсутній відповідний файл.<br>Або "
+"виберіть файл для цього шару, або скасуйте зміни.<br>Шар без файлу:</html>"
+msgstr[1] ""
+"<html>{0} шари потрібно зберегти, але відсутній відповідний файл.<br>Або "
+"виберіть файл для кожного шару, або скасуйте зміни.<br>Шари без файлу:</html>"
+msgstr[2] ""
+"<html>{0} шарів потрібно зберегти, але відсутній відповідний файл.<br>Або "
+"виберіть файл для кожного шару, або скасуйте зміни.<br>Шари без файлу:</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+msgid "Unsaved data and missing associated file"
+msgstr "Незбережені дані і відсутній відповідний файл"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#, java-format
+msgid ""
+"<html>{0} layer needs saving but has an associated file<br>which cannot be "
+"written.<br>Either select another file for this layer or discard the changes."
+"<br>Layer with a non-writable file:</html>"
+msgid_plural ""
+"<html>{0} layers need saving but have associated files<br>which cannot be "
+"written.<br>Either select another file for each of them or discard the "
+"changes.<br>Layers with non-writable files:</html>"
+msgstr[0] ""
+"<html>{0} шар потрібно зберегти, але в пов’язаний з ним файл<br>не можливо "
+"здійснити запис.<br>Або оберіть інший файл для цього шару, або відмініть "
+"зміни.<br>Шар з файлом, в який не можливо здійснити запис:</html>"
+msgstr[1] ""
+"<html>{0} шари потрібно зберегти, але в пов’язані з ними файли<br>не можливо "
+"здійснити запис.<br>Або оберіть інший файл для кожного шару, або відмініть "
+"зміни.<br>Шари з файлами, в які не можливо здійснити запис:</html>"
+msgstr[2] ""
+"<html>{0} шарів потрібно зберегти, але в пов’язані з ними файли<br>не "
+"можливо здійснити запис.<br>Або оберіть інший файл для кожного шару, або "
+"відмініть зміни.<br>Шари з файлами, в які не можливо здійснити запис:</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+msgid "Unsaved data non-writable files"
+msgstr "Не збережені дані для файлів, в які неможливо здійснити запис"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgid "Close this dialog and resume editing in JOSM"
+msgstr "Закрити цей діалог і продовжити редагування в JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+msgid "Discard and Exit"
+msgstr "Відмінити і Вийти"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+msgid "Exit JOSM without saving. Unsaved changes are lost."
+msgstr "Вийти з JOSM без збереження. Незбережені зміни будуть втрачені."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+msgid "Discard and Delete"
+msgstr "Скинути і Вилучити"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
+msgid "Delete layers without saving. Unsaved changes are lost."
+msgstr "Вилучити шари без збереження. Незбережені дані будуть втрачені."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+msgid "Save/Upload and Exit"
+msgstr "Зберегти/Надіслати на сервер і Вийти"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
+msgstr ""
+"Вихід з JOSM з збереженням. Незбережені зміни будуть збережені локально або "
+"завантажені на сервер."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+msgid "Save/Upload and Delete"
+msgstr "Зберегти/Передати на сервер і Вилучити"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
+msgstr ""
+"Зберегти/Надіслати на сервер перед вилученням. Зміни не будуть втрачені."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#, java-format
+msgid "Preparing layer ''{0}'' for upload ..."
+msgstr "Підготовка шару ''{0}'' для надсилання…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
+#, java-format
+msgid ""
+"<html>An upload and/or save operation of one layer with modifications<br>was "
+"cancelled or has failed.</html>"
+msgid_plural ""
+"<html>Upload and/or save operations of {0} layers with modifications<br>were "
+"cancelled or have failed.</html>"
+msgstr[0] ""
+"<html>Операція надсилання та/або збереження одного шару зі змінами<br>була "
+"скасована або не вдалась.</html>"
+msgstr[1] ""
+"<html>Операції надсилання та/або збереження {0} шарів зі змінами<br>були "
+"скасовані або не вдались.</html>"
+msgstr[2] ""
+"<html>Операції надсилання та/або збереження {0} шарів зі змінами<br>були "
+"скасовані або не вдались.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
+msgid "Incomplete upload and/or save"
+msgstr "Неповне збереження/надсилання на сервер"
+
+#. item "Highways/Streets/Motorway" text "Name"
+#. item "Highways/Streets/Motorway Link" label "Edit Motorway Link"
+#. <space />
+#. <key key="highway" value="motorway_link" />
+#. <optional>
+#. item "Highways/Streets/Trunk" text "Name"
+#. item "Highways/Streets/Trunk Link" text "Reference"
+#. <optional>
+#. item "Highways/Streets/Primary" text "Name"
+#. item "Highways/Streets/Primary Link" label "Edit Primary Link"
+#. <space />
+#. <key key="highway" value="primary_link" />
+#. <optional>
+#. item "Highways/Streets/Secondary" text "Name"
+#. item "Highways/Streets/Tertiary" text "Name"
+#. item "Highways/Streets/Unclassified" check "Passing Places"
+#. item "Highways/Streets/Residential" check "Embankment"
+#. item "Highways/Streets/Living Street" check "Embankment"
+#. item "Highways/Streets/Pedestrian" check "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
+#. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
+#. item "Highways/Streets/Roundabout" check "Embankment"
+#. item "Highways/Streets/Bridge" text "Name"
+#. item "Highways/Streets/Tunnel" text "Name"
+#. item "Ways/Track" check "Oneway"
+#. item "Ways/Dedicated Bridleway" check "Embankment"
+#. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
+#. item "Ways/Steps" check "Embankment"
+#. item "Water/Water/Drain" text "Name"
+#. item "Water/Water/Ditch" text "Name"
+#. item "Water/Water/Stream" text "Name"
+#. item "Water/Water/Canal" text "Name"
+#. item "Water/Water/River" text "Name"
+#. item "Transport/Railway/Bus Guideway" check "Embankment"
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
+#: build/trans_presets.java:79 build/trans_presets.java:96
+#: build/trans_presets.java:115 build/trans_presets.java:134
+#: build/trans_presets.java:155 build/trans_presets.java:171
+#: build/trans_presets.java:192 build/trans_presets.java:212
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
+msgid "Layer"
+msgstr "Шар"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
+msgid "Should upload?"
+msgstr "Надіслати?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36
+msgid "Should save?"
+msgstr "Зберегти?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
+msgid "Filename"
+msgstr "Назва файлу"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
+msgid "Upload"
+msgstr "Надіслати"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:56
+msgid "Update objects"
+msgstr "Оновити об'єкти"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:107
+msgid "Initializing nodes to update ..."
+msgstr "Ініціалізація точок для оновлення…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:123
+msgid "Initializing ways to update ..."
+msgstr "Ініціалізація ліній для оновлення…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:132
+msgid "Initializing relations to update ..."
+msgstr "Ініціалізація зв’язків для оновлення…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
+#: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:85
+msgid "Settings"
+msgstr "Параметри"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
+msgid "Decide how to upload the data and which changeset to use"
+msgstr "Вирішіть, як завантажувати дані та які використовувати набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:448
+msgid "Tags of new changeset"
+msgstr "Теґи нового набору змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
+msgid "Apply tags to the changeset data is uploaded to"
+msgstr "Застосувати теґи до набору змін, який надіслано на сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
+msgid "Manage open changesets and select a changeset to upload to"
+msgstr ""
+"Керування відкритими наборами змін та вибір наборів для надсилання на сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
+msgid "Configure advanced settings"
+msgstr "Налаштування додаткових параметрів"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:174
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:464
+#, java-format
+msgid "Upload to ''{0}''"
+msgstr "Надіслати до ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
+msgid "Upload Changes"
+msgstr "Надіслати зміни"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:357
+msgid "Upload the changed primitives"
+msgstr "Надіслати на сервер змінені елементи"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+"Будь ласка, введіть коментар для надсилання на сервер цього набору змін "
+"(мін. 3 символи)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
+msgid "Illegal upload comment"
+msgstr "Невірний коментар для надсилання на сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:373
+msgid "Please enter a valid chunk size first"
+msgstr "Будь ласка, спочатку введіть вірний розмір порції"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:374
+msgid "Illegal chunk size"
+msgstr "Невірний розмір порції"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:408
+msgid "Cancel the upload and resume editing"
+msgstr "Відмінити надсилання даний та повернутись до редагування"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:450
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr "Теґи набору змін {0}"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
+#, java-format
+msgid ""
+"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
+"primitive and retrying to upload."
+msgstr ""
+"Попередження: елемент ''{0}'' вже вилучено з сервера. Повторне надсилання на "
+"сервер буде здійснено без цього елементу."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:108
+msgid "Preparing primitives to upload ..."
+msgstr "Підготовка елементів до надсилання на сервер…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
+msgid "Objects are uploaded to a <strong>new changeset</strong>."
+msgstr "Об’єкти були надіслані до <strong>нового набору змін</strong>."
+
+#: ../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 ""
+"Об’єкти були надіслані до <strong>відкритого набору змін</strong> {0} з "
+"коментарем ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
+msgid "The changeset is going to be <strong>closed</strong> after this upload"
+msgstr "Набір правок буде <strong>закритий</strong> після надсилання на сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
+msgid "The changeset is <strong>left open</strong> after this upload"
+msgstr ""
+"Набір правок буде <strong>залишиться відкритим</strong> після цього "
+"надсилання на сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:59
+msgid "configure changeset"
+msgstr "налаштувати набір змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:81
+#, 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] ""
+"Надсилання <strong>{0} об’єкта</strong> до <strong>1 набору змін</strong>"
+msgstr[1] ""
+"Надсилання <strong>{0} об’єктів</strong> до <strong>1 набору змін</strong>"
+msgstr[2] ""
+"Надсилання <strong>{0} об’єктів</strong> до <strong>1 набору змін</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
+#, 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] ""
+"Надсилання <strong>{0} об’єкта</strong> до <strong>1 набору змін</strong> "
+"використовуючи <strong>1 запит</strong>"
+msgstr[1] ""
+"Надсилання <strong>{0} об’єктів</strong> до <strong>1 набору змін</strong> "
+"використовуючи <strong>1 запит</strong>"
+msgstr[2] ""
+"Надсилання <strong>{0} об’єктів</strong> до <strong>1 набору змін</strong> "
+"використовуючи <strong>1 запит</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
+#, java-format
+msgid ""
+"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
+"<strong>{1} requests</strong>"
+msgstr ""
+"Надсилання <strong>{0} об’єктів</strong> до <strong>1 набору змін</strong> "
+"використовуючи <strong>{1} запит(и)</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:102
+msgid "advanced configuration"
+msgstr "розширене налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:98
+#, 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 ""
+"{0} об’єкт(ів) перевищили макс. дозволену кількість ({1}) об’єктів в наборі "
+"змін на сервері ''{2}''. Будь ласка, <a href=\"urn:advanced-configuration"
+"\">укажіть</a> яким чином поводитись з <strong>кількома наборами змінне</"
+"strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
+#, java-format
+msgid ""
+"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
+"strong> using <strong>{1} requests</strong>"
+msgstr ""
+"надсилання на сервер <strong>{0} об’єтів</strong> в <strong>кількох наборах "
+"змін</strong>, використовуючи <strong>{1} запити(ів)</strong>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67
+#, java-format
+msgid "Uploading data for layer ''{0}''"
+msgstr "Надсилання даних з шару ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:81
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:275
+msgid "Continue uploading"
+msgstr "Продовжити надсилання"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:83
+msgid "Click to continue uploading to additional new changesets"
+msgstr "Натисніть для продовження надсилання в додаткові нові набори змін"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:87
+msgid "Go back to Upload Dialog"
+msgstr "Повернутись до діалогу надсилання даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:89
+msgid "Click to return to the Upload Dialog"
+msgstr "Натисніть щоб повернутись до діалогу надсилання даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:93
+msgid "Abort"
+msgstr "Відмінити"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:95
+msgid "Click to abort uploading"
+msgstr "Натисніть для скасування надсилання"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:100
+#, java-format
+msgid ""
+"The server reported that the current changeset was closed.<br>This is most "
+"likely because the changesets size exceeded the max. size<br>of {0} objects "
+"on the server ''{1}''."
+msgstr ""
+"Сервер повідомив, що поточний набір змін закрито.<br>Швидше за все, це "
+"сталося тому, що набір змін досяг свого максимального розміру —<br>{0} "
+"об’єктів на сервері ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:107
+#, java-format
+msgid "There is {0} object left to upload."
+msgid_plural "There are {0} objects left to upload."
+msgstr[0] "Лишилось завантажити {0} об’єкт."
+msgstr[1] "Лишилось завантажити {0} об’єкти."
+msgstr[2] "Лишилось завантажити {0} об’єктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:113
+#, java-format
+msgid ""
+"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
+"changesets.<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 ""
+"Натисніть ''<strong>{0}</strong>'', щоб  продовжити надсилання на сервер у "
+"нові додаткові набори змін.<br>Натисніть ''<strong>{1}</strong>'', щоб "
+"повернутись до діалогу надсилання на сервер.<br>Натисніть ''<strong>{2}</"
+"strong>'', щоб скасувати надсилання на сервер та повернутись до редагування "
+"мапи.<br>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
+msgid "Changeset is full"
+msgstr "Набір змін заповнений"
+
+#. we tried to delete an already deleted primitive.
+#.
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
+#, java-format
+msgid ""
+"Warning: object ''{0}'' is already deleted on the server. Skipping this "
+"object and retrying to upload."
+msgstr ""
+"Попередження: об’єкт ''{0}'' вилучений на сервері. Дані будуть знову "
+"надіслані на сервер, але без цього об'єкта."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195
+#, java-format
+msgid "Object ''{0}'' is already deleted. Skipping object in upload."
+msgstr ""
+"Об’єкт ''{0}'' вилучений. Об’єкт буде пропущено під час надсилання даних на "
+"сервер."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] "Надсилання {0} об’єкту…"
+msgstr[1] "Надсилання {0} об’єктів…"
+msgstr[2] "Надсилання {0} об’єктів…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
+#, java-format
+msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
+msgstr ""
+"Ігнорування виявленого виключення, тому що надсилання на сервер скасовано. "
+"Помилка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60
+msgid ""
+"<html>Mark modified objects <strong>from the current selection</strong> to "
+"be uploaded to the server.</html>"
+msgstr ""
+"<html>Позначити змінені об’єкти<strong>в поточному виборі</strong>, які "
+"треба надіслати на сервер.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
+msgid ""
+"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
+"server.</html>"
+msgstr ""
+"<html>Позначити <strong>локально вилучені об’єкти</strong>, які потрібно "
+"вилучити на сервері.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:112
+msgid "Select objects to upload"
+msgstr "Виділити об’єкти для надсилання"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:261
+msgid "Cancel uploading"
+msgstr "Відмінити надсилання"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86
+#, java-format
+msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
+msgstr ""
+"Попередження: несподіване значення ключа ''{0}'' в налаштуваннях, отримано "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
+msgid "Please select the upload strategy:"
+msgstr "Будь ласка, виберіть стратегію надсилання:"
+
+#: ../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 "Надсилати дані одним запитом"
+
+#: ../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 "Надсилати кожний об’єкт окремо"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
+#, java-format
+msgid ""
+"<html>There are <strong>multiple changesets</strong> necessary in order to "
+"upload {0} objects. Which strategy do you want to use?</html>"
+msgstr ""
+"<html>Потрібно використати<strong>кілька наборів змін</strong>, щоб "
+"надіслати {0} об’єктів. Яку стратегію ви бажаєте застосувати?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
+msgid "Fill up one changeset and return to the Upload Dialog"
+msgstr ""
+"Заповнити один набір змін і повернутися до діалогу надсилання даних на сервер"
+
+#: ../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>Cannot upload {0} objects in one request because the<br>max. changeset "
+"size {1} on server ''{2}'' is exceeded.</html>"
+msgstr ""
+"<html>Неможливо надіслати на сервер об’єкти в кількості {0} штук одним "
+"запитом, тому що<br>перевищено макс. розмір набору змін {1} на сервері "
+"''{2}''.</html>"
+
+#: ../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 strategy do you want to use?</html>"
+msgstr ""
+"<html>Потрібно <strong>кілька наборів змін</strong>, щоб надіслати на сервер "
+"{0} об’єктів. Я стратегію ви обираєте?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
+msgid "(1 request)"
+msgstr "(1 запит)"
+
+#: ../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 "(кількість запитів невідома)"
+
+#: ../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} запит)"
+msgstr[1] "({0} запити)"
+msgstr[2] "({0} запитів)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
+msgid "Illegal chunk size <= 0. Please enter an integer > 1"
+msgstr "Невірний розмір порції <= 0. Будь ласка, введіть ціле число > 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 ""
+"Розмір порції {0} перевищує макс. розмір набору змін {1} для сервера ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415
+msgid "Please enter an integer > 1"
+msgstr "Будь ласка, введіть ціле число > 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 "Значення ''{0}'' — не число. Будь ласка, введіть ціле число > 1"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52
+msgid "Objects to add:"
+msgstr "Додати об’єкти:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:58
+msgid "Objects to modify:"
+msgstr "Змінити об’єкти:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:64
+msgid "Objects to delete:"
+msgstr "Вилучити об’єкти:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:95
+#, java-format
+msgid "{0} object to add:"
+msgid_plural "{0} objects to add:"
+msgstr[0] "Додати {0} об’єкт:"
+msgstr[1] "Додати {0} об’єкти:"
+msgstr[2] "Додати {0} об’єктів:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:104
+#, java-format
+msgid "{0} object to modify:"
+msgid_plural "{0} objects to modify:"
+msgstr[0] "Змінити {0} об’єкт:"
+msgstr[1] "Змінити {0} об’єкти:"
+msgstr[2] "Змінити {0} об’єктів:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113
+#, java-format
+msgid "{0} object to delete:"
+msgid_plural "{0} objects to delete:"
+msgstr[0] "Вилучити {0} об’єкт:"
+msgstr[1] "Вилучити {0} об’єкти:"
+msgstr[2] "Вилучити {0} об’єктів:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
+#: ../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"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
+msgid "Customize line drawing"
+msgstr "Налаштувати креслення ліній"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:136
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
+msgid "Use global settings."
+msgstr "Використовувати загальні налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
+msgid "Draw lines between points for this layer."
+msgstr "Креслити лінії між точками цього шару."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:138
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
+msgid "Do not draw lines between points for this layer."
+msgstr "Не креслити лінії між точками цього шару."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:152
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
+msgid "Select line drawing options"
+msgstr "Вибрати варіанти креслення ліній"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+msgid "Customize Color"
+msgstr "Налаштувати колір"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../plugins/grid/src/grid/GridLayer.java:162
+msgid "Default"
+msgstr "Типовий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:178
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:209
+#: ../plugins/grid/src/grid/GridLayer.java:163
+msgid "Choose a color"
+msgstr "Вибрати колір"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+msgid "Markers From Named Points"
+msgstr "Позначки з іменованих точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:213
+#, java-format
+msgid "Named Trackpoints from {0}"
+msgstr "Іменовані точки треку з {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:221
+msgid "Import Audio"
+msgstr "Імпортувати аудіо"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:225
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with audio data.</html>"
+msgstr ""
+"<html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як точки не "
+"містять міток часу, ми не можемо синхронізувати їх з аудіо-даними.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:232
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:315
+msgid "Import not possible"
+msgstr "Імпорт неможливий"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:254
+msgid "Wave Audio files (*.wav)"
+msgstr "Аудіофайли Wave (*.wav)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:288
+#, java-format
+msgid "Audio markers from {0}"
+msgstr "Аудіо позначки з {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:303
+msgid "Import images"
+msgstr "Імпорт зображень"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:308
+#, java-format
+msgid ""
+"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
+"<br>Because its way points do not include a timestamp we cannot correlate "
+"them with images.</html>"
+msgstr ""
+"<html><html>Дані в шарі GPX ''{0}'' були завантажені з сервера.<br>Так як "
+"точки не містять міток часу, ми не можемо синхронізувати їх з зображеннями.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
+#, java-format
+msgid "Name: {0}"
+msgstr "Назва: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:416
+#, java-format
+msgid "Description: {0}"
+msgstr "Опис: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
+#, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} трек"
+msgstr[1] "{0} треки"
+msgstr[2] "{0} треків"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3218
+msgid "Description"
+msgstr "Опис"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:383
+msgid "Timespan"
+msgstr "Період"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:384
+msgid "Length"
+msgstr "Довжина"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+msgid "Length: "
+msgstr "Довжина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:448
+#, java-format
+msgid "{0} route, "
+msgid_plural "{0} routes, "
+msgstr[0] "{0} маршрут, "
+msgstr[1] "{0} маршрути, "
+msgstr[2] "{0} маршрутів, "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:449
+#, java-format
+msgid "{0} waypoint"
+msgid_plural "{0} waypoints"
+msgstr[0] "{0} точка маршруту"
+msgstr[1] "{0} точки маршруту"
+msgstr[2] "{0} точок маршруту"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:808
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
+msgid "Convert to data layer"
+msgstr "Перетворити в шар даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:"
+msgstr ""
+"<html>Надсилання на сервер необроблених даних GPS під виглядом даних мапи "
+"вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з цим:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:818
+#: ../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:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
+#, java-format
+msgid "Converted from: {0}"
+msgstr "Перетворено з: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:863
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:891
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:990
+msgid "Download from OSM along this track"
+msgstr "Завантажити з OSM дані уздовж цього треку"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:871
+msgid "Download everything within:"
+msgstr "Завантажити всі в межах:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:874
+#, java-format
+msgid "{0} meters"
+msgstr "{0} метрів"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:879
+msgid "Maximum area per request:"
+msgstr "Максимальна ділянка для одного запиту:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:882
+#, java-format
+msgid "{0} sq km"
+msgstr "{0} кв. км."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:982
+#, java-format
+msgid ""
+"<html>This action will require {0} individual<br>download requests. Do you "
+"wish<br>to continue?</html>"
+msgstr ""
+"<html>Ця дія потребує {0} окремих<br>запитів на завантаження. Продовжити?</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1091
+msgid "No GPX track available in layer to associate audio with."
+msgstr "На шарі відсутній трек GPX, щоб накласти звук."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1251
+msgid ""
+"Some waypoints with timestamps from before the start of the track or after "
+"the end were omitted or moved to the start."
+msgstr ""
+"Деякі точки створені до початку треку або після його закінчення і будуть "
+"пропущені або перенесені на початок треку."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1258
+msgid ""
+"Some waypoints which were too far from the track to sensibly estimate their "
+"time were omitted."
+msgstr ""
+"Деякі точки, які були занадто далеко від інших, були проігноровані при "
+"розрахунку часу."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:118
+#, java-format
+msgid "Data Layer {0}"
+msgstr "Шар даних {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
+msgid "outside downloaded area"
+msgstr "по-за межами завантаженої ділянки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
+#, java-format
+msgid "version {0}"
+msgstr "версія {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
+msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
+msgstr "Увага: спільне використання даних версій 0.6 і 0.5 у версії 0.5"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
+#, java-format
+msgid "There was {0} conflict detected."
+msgid_plural "There were {0} conflicts detected."
+msgstr[0] "Виявлено {0} конфлікт."
+msgstr[1] "Виявлено {0} конфлікти."
+msgstr[2] "Виявлено {0} конфліктів."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
+#, java-format
+msgid ""
+"{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
+"object<br>from the local dataset because it is deleted on the server."
+msgid_plural ""
+"{0} conflicts have been <strong>resolved automatically</strong> by purging "
+"{0} objects<br> from the local dataset because they are deleted on the "
+"server."
+msgstr[0] ""
+"{0} конфлікт був <strong>розв’язаний автоматично</strong> шляхом очищення "
+"{0} об’єкту<br>з локального набору даних, так як об’єкт вже був вилучений на "
+"сервері."
+msgstr[1] ""
+"{0} конфлікти були <strong>розв’язані автоматично</strong> шляхом очищення "
+"{0} об’єктів<br>з локального набору даних, так як об’єкти вже були вилучений "
+"на сервері."
+msgstr[2] ""
+"{0} конфліктів було <strong>розв’язано автоматично</strong> шляхом очищення "
+"{0} об’єктів<br>з локального набору даних, так як об’єкти вже були вилучений "
+"на сервері."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
+#, java-format
+msgid ""
+"{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
+"Dialog and manually resolve it."
+msgid_plural ""
+"{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
+"Dialog and manually resolve them."
+msgstr[0] ""
+"Лишилось розв’язати {0} конфлікт.<br><br>Будь ласка, відкрийте діалог списку "
+"конфліктів і розв’яжіть конфлікт вручну."
+msgstr[1] ""
+"Лишилось розв’язати {0} конфлікти.<br><br>Будь ласка, відкрийте діалог "
+"списку конфліктів і розв’яжіть конфлікти вручну."
+msgstr[2] ""
+"Лишилось розв’язати {0} конфліктів.<br><br>Будь ласка, відкрийте діалог "
+"списку конфліктів і розв’яжіть конфлікти вручну."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
+msgid "Click to close this dialog and continue editing"
+msgstr "Натисніть, щоб закрити цей діалог і продовжити редагування"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#, java-format
+msgid "{0} deleted"
+msgid_plural "{0} deleted"
+msgstr[0] "{0} вилучений"
+msgstr[1] "{0} вилучені"
+msgstr[2] "{0} вилучено"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
+#, java-format
+msgid "{0} consists of:"
+msgstr "{0} складається з:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+msgid "unset"
+msgstr "відключено"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
+#, java-format
+msgid "API version: {0}"
+msgstr "Версія API: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
+msgid "Convert to GPX layer"
+msgstr "Перетворити в шар GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
+msgid "Dataset consistency test"
+msgstr "Тест узгодженості набору даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
+msgid "No problems found"
+msgstr "Проблем не виявлено"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
+msgid "Following problems found:"
+msgstr "Виявлені наступні проблеми:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
+msgid ""
+"<html>Upload of unprocessed GPS data as map data is considered harmful."
+"<br>If you want to upload traces, look here:</html>"
+msgstr ""
+"<html>Надсилання на сервер необроблених даних GPS під виглядом даних мапи "
+"вважається шкідливим.<br>Якщо хочете завантажити треки, ознайомтеся з цим:</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161
+msgctxt "gps"
+msgid "track"
+msgid_plural "tracks"
+msgstr[0] "трек"
+msgstr[1] "треки"
+msgstr[2] "треків"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:162
+msgid "point"
+msgid_plural "points"
+msgstr[0] "точка"
+msgstr[1] "точки"
+msgstr[2] "точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:191
+#, java-format
+msgid "a track with {0} point"
+msgid_plural "a track with {0} points"
+msgstr[0] "трек з {0} точкою"
+msgstr[1] "трек з {0} точками"
+msgstr[2] "трек з {0} точками"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#, java-format
+msgid "{0} consists of {1} track"
+msgid_plural "{0} consists of {1} tracks"
+msgstr[0] "{0} складається з {1} треку"
+msgstr[1] "{0} складається з {1} треків"
+msgstr[2] "{0} складається з {1} треків"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:195
+#, java-format
+msgid "{0} point"
+msgid_plural "{0} points"
+msgstr[0] "{0} точка"
+msgstr[1] "{0} точки"
+msgstr[2] "{0} точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
+msgid "GPX Files (*.gpx *.gpx.gz)"
+msgstr "Файли GPX (*.gpx *.gpx.gz)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
+#, java-format
+msgid "File {0} is loaded yet under the name \"{1}\""
+msgstr "Файл {0} завантажено під іменем \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
+#, java-format
+msgid "Error while parsing {0}"
+msgstr "Помилка синтаксичного аналізу {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
+#, java-format
+msgid "Could not read \"{0}\""
+msgstr "Неможливо прочитати \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
+msgid ""
+"<html>Take a photo of your GPS receiver while it displays the time."
+"<br>Display that photo here.<br>And then, simply capture the time you read "
+"on the photo and select a timezone<hr></html>"
+msgstr ""
+"<html>Зробіть фото вашого GPS приймача, коли він показує час.<br>Покажіть "
+"його тут.<br>І потім, просто візьміть час з фото та оберіть часовий "
+"пояс<hr></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:258
+msgid "Photo time (from exif):"
+msgstr "Час з фото (з exif):"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:273
+msgid "Gps time (read from the above photo): "
+msgstr "Час GPS (зі знімку над фото): "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:285
+msgid " [dd/mm/yyyy hh:mm:ss]"
+msgstr " [дд/мм/рррр гг:хх:сс]"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:293
+msgid "I am in the timezone of: "
+msgstr "Я в часовому поясі: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:392
+msgid "No date"
+msgstr "Без дати"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:366
+msgid "Open another photo"
+msgstr "Відкрити інше фото"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:406
+msgid "Synchronize time from a photo of the GPS receiver"
+msgstr "Синхронізуйте час з фото та GPS-приймача"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+msgid ""
+"Error while parsing the date.\n"
+"Please use the requested format"
+msgstr ""
+"Помилка розбору дати.\n"
+"Будь ласка використовуйте формат запиту"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:421
+msgid "Invalid date"
+msgstr "Невірна дата"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
+msgid "<No GPX track loaded yet>"
+msgstr "<GPX-трек ще не заватажено>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
+msgid "GPX track: "
+msgstr "Трек GPX: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:479
+msgid "Open another GPX trace"
+msgstr "Відкрийте інший GPX-трек"
+
+#: ../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 ""
+"<html>Використовуйте фото для встановлення точного часу,<br>наприклад, з "
+"екрану GPS-приймача</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:514
+msgid "Auto-Guess"
+msgstr "Авто-вгадування"
+
+#: ../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
+msgid "Override position for: "
+msgstr "Перевстановити позицію для: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:526
+#, java-format
+msgid "Images with geo location in exif data ({0}/{1})"
+msgstr "Зображення з координатами місця розташування в даних exif ({0}/{1})"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:529
+#, java-format
+msgid "Images that are already tagged ({0}/{1})"
+msgstr "Зображення, які вже позначені ({0}/{1})"
+
+#: ../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:560
+msgid "Timezone: "
+msgstr "Часовий пояс: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:571
+msgid "Offset:"
+msgstr "Зміщення:"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:645
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:688
+msgid "Correlate images with GPX track"
+msgstr "Зіставити зображення з GPX треком"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:646
+msgid "Correlate"
+msgstr "Узгодити"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+msgid "Invalid timezone"
+msgstr "Невірний часовий пояс"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:681
+msgid "Invalid offset"
+msgstr "Невірне зміщення"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
+msgid "Try Again"
+msgstr "Спробувати знову"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:690
+msgid "No images could be matched!"
+msgstr "Немає відповідних зображень!"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:814
+msgid "No gpx selected"
+msgstr "gpx не виділено"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:819
+#, java-format
+msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
+msgid_plural ""
+"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
+msgstr[0] "<html><b>{0}</b> з <b>{1}</b> фото відповідає треку GPX.</html>"
+msgstr[1] "<html><b>{0}</b> з <b>{1}</b> фото відповідає треку GPX.</html>"
+msgstr[2] "<html><b>{0}</b> з <b>{1}</b> фото відповідає треку GPX.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:900
+#, java-format
+msgid "Timezone: {0}"
+msgstr "Часовий пояс: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:901
+#, java-format
+msgid "Minutes: {0}"
+msgstr "Хвилини: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:902
+#, java-format
+msgid "Seconds: {0}"
+msgstr "Секунди: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:920
+#, java-format
+msgid "(Time difference of {0} day)"
+msgid_plural "Time difference of {0} days"
+msgstr[0] "Розбіжність у часі {0} день"
+msgstr[1] "Розбіжність у часі {0} дні"
+msgstr[2] "Розбіжність у часі {0} днів"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
+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 ""
+"Сталася помилка під час спроби зіставити фотографії з GPX треком. Ви можете "
+"вручну зіставити фотографії за допомогою повзунків."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:949
+msgid "Matching photos to track failed"
+msgstr "Не вдалося зіставити фотографії з треком"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:965
+msgid "Adjust timezone and offset"
+msgstr "Налаштування часового поясу і зсуву"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:985
+msgid "The selected photos do not contain time information."
+msgstr "Вибрані фотографії не містять інформацію про час."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:986
+msgid "Photos do not contain time information"
+msgstr "Фотографії не містять інформацію про час."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
+msgid ""
+"The selected GPX track does not contain timestamps. Please select another "
+"one."
+msgstr ""
+"Точки в обраному GPX треку не містять часових позначок. Будь ласка, виберіть "
+"інший."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1015
+msgid "GPX Track has no time information"
+msgstr "GPX Трек не має інформації про час"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1110
+msgid "You should select a GPX track"
+msgstr "Ви повинні вибрати трек GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1111
+msgid "No selected GPX track"
+msgstr "Трек GPX не виділено"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1299
+#, java-format
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Помилка в часовому поясі.\n"
+"Очікуваний формат: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1369
+#, java-format
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Помилка зсуву.\n"
+"Очікуваний формат: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:105
+msgid "Extracting GPS locations from EXIF"
+msgstr "Видобування координат GPS з EXIF"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:113
+msgid "Starting directory scan"
+msgstr "Запуск сканування каталогу"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:118
+msgid "One of the selected files was null"
+msgstr "Один з виділених файлів порожній"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:126
+msgid "Read photos..."
+msgstr "Переглянути фотографії…"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:138
+#, java-format
+msgid "Reading {0}..."
+msgstr "Перегляд {0}…"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:177
+#, java-format
+msgid "Unable to get canonical path for directory {0}\n"
+msgstr "Не вдалося отримати канонічний шлях до каталогу {0}\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:189
+#, java-format
+msgid "Scanning directory {0}"
+msgstr "Сканування каталогу  {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:194
+#, java-format
+msgid "Found null file in directory {0}\n"
+msgstr "Знайдено порожній файл в каталозі {0}\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:197
+#, java-format
+msgid "Error while getting files from directory {0}\n"
+msgstr "Помилка читання файлів з каталогу {0}\n"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
+msgid "Geotagged Images"
+msgstr "Зображення з геотеґами"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:295
+msgid "Correlate to GPX"
+msgstr "Відносяться до GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:323
+#, java-format
+msgid "{0} image loaded."
+msgid_plural "{0} images loaded."
+msgstr[0] "Завантажено {0} зображення."
+msgstr[1] "Завантажено {0} зображення."
+msgstr[2] "Завантажено {0} зображень."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:324
+#, java-format
+msgid "{0} was found to be GPS tagged."
+msgid_plural "{0} were found to be GPS tagged."
+msgstr[0] "{0} знайдений, з GPS позначками."
+msgstr[1] "{0} знайдені, з GPS позначками."
+msgstr[2] "{0} знайдено, з GPS позначками."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
+msgid "Delete image file from disk"
+msgstr "Вилучити зображення з диску"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:599
+#, java-format
+msgid ""
+"<html><h3>Delete the file {0} from disk?<p>The image file will be "
+"permanently lost!</h3></html>"
+msgstr ""
+"<html><h3>Вилучити файл {0} з диску?<p>Файл зображення буде остаточно "
+"втрачено!</h3></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:624
+msgid "Image file could not be deleted."
+msgstr "Не можливо вилучити файл зображення"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432
+msgid "No image"
+msgstr "Немає зображень"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:442
+#, java-format
+msgid "Loading {0}"
+msgstr "Завантаження {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:471
+#, java-format
+msgid "Error on file {0}"
+msgstr "Помилка в файлі {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
+msgid "Display geotagged images"
+msgstr "Показати зображення з гео-теґами"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
+msgid "Previous"
+msgstr "Попереднє"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+msgid "Show previous Image"
+msgstr "Показати попереднє зображення"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#, java-format
+msgid "Geoimage: {0}"
+msgstr "Геозображення: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
+msgid "Remove photo from layer"
+msgstr "Вилучити фото із шару"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+msgid "Delete File from disk"
+msgstr "Вилучити файл з диску"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+msgid "Next"
+msgstr "Наступне"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+msgid "Show next Image"
+msgstr "Показати наступне зображення"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
+msgid "Center view"
+msgstr "Центрувати вид"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
+msgid "Zoom best fit and 1:1"
+msgstr "Масштабувати, щоб вписати зі співвідношенням сторін 1:1"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
+msgid "Move dialog to the side pane"
+msgstr "Пересунути діалог на бічну панель"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
+#, java-format
+msgid ""
+"\n"
+"Altitude: {0} m"
+msgstr ""
+"\n"
+"Висота: {0} м"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
+#, java-format
+msgid ""
+"\n"
+"{0} km/h"
+msgstr ""
+"\n"
+"{0} км/г"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/JpegFileFilter.java:31
+msgid "JPEG images (*.jpg)"
+msgstr "Зображення JPEG (*.jpg)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:153
+msgid "gps marker"
+msgstr "позначка GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:177
+msgid "marker"
+msgid_plural "markers"
+msgstr[0] "позначка"
+msgstr[1] "позначки"
+msgstr[2] "позначок"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#, java-format
+msgid "{0} consists of {1} marker"
+msgid_plural "{0} consists of {1} markers"
+msgstr[0] "{0} складається з {1} позначки"
+msgstr[1] "{0} складається з {1} позначок"
+msgstr[2] "{0} складається з {1} позначок"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:230
+msgid "Synchronize Audio"
+msgstr "Синхронізувати аудіо"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+msgid ""
+"You need to pause audio at the moment when you hear your synchronization cue."
+msgstr ""
+"Вам необхідно призупинити відтворення, коли ви почуєте вашу мітку "
+"синхронізації."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
+#, java-format
+msgid "Audio synchronized at point {0}."
+msgstr "Аудіо синхронізовано у точці {0}."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:258
+msgid "Unable to synchronize in layer being played."
+msgstr "Не вдається синхронізувати в шарі, який програється."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:262
+msgid "Make Audio Marker at Play Head"
+msgstr "Встановити позначку аудіо на позиції програвання"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+msgid ""
+"You need to have paused audio at the point on the track where you want the "
+"marker."
+msgstr ""
+"Ви повинні поставити аудіо на паузу в тій точці шляху, де хочете поставити "
+"позначку."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:350
+msgid "No existing audio markers in this layer to offset from."
+msgstr ""
+"В цьому шарі відсутні аудіо-позначки від яких можливо зробити зрушення."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
+msgid "Show Text/Icons"
+msgstr "Показати текст/значки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
+msgid "Toggle visible state of the marker text and icons."
+msgstr "Показати/приховати текст і значки."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
+msgid ""
+"You need to drag the play head near to the GPX track whose associated sound "
+"track you were playing (after the first marker)."
+msgstr ""
+"Вам потрібно перетягнути повзунок програвача до GPX-треку, з яким пов’язана "
+"звукова доріжка (після першої позначки)."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
+msgid ""
+"You need to SHIFT-drag the play head onto an audio marker or onto the track "
+"point where you want to synchronize."
+msgstr ""
+"Натисніть SHIFT і перетягніть повзунок програвача на аудіо-позначку чи на "
+"точку треку, з якою ви бажаєте синхронізуватись."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
+msgid "Unable to create new audio marker."
+msgstr "Неможливо створити нову аудіо-позначку."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:43
+msgid "There was an error while trying to display the URL for this marker"
+msgstr "Сталася помилка при спробі показати URL для цієї позначки"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:44
+msgid "(URL was: "
+msgstr "(посилання: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/WebMarker.java:45
+msgid "Error displaying URL"
+msgstr "Помилка показу URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
+msgid "Illegal dash pattern, values must be positive"
+msgstr "Невірний шаблон переривчастою лінії, значення має бути позитивним"
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
+msgid "Illegal dash pattern, at least one value must be > 0"
+msgstr ""
+"Невірний шаблон переривчастою лінії, принаймні, одне значення має бути> 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:102
+#, java-format
+msgid ""
+"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Попередження: не вдалося завантажити стилі Mappaint з ''{0}''. Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:105
+#, java-format
+msgid ""
+"Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr ""
+"Попередження: не вдалося здійснити розбір стилів Mappaint з ''{0}''. "
+"Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:68
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:234
+msgid "Access Token Key:"
+msgstr "Ключ мітки доступу:"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:82
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:246
+msgid "Access Token Secret:"
+msgstr "Таємний ключ мітки доступу:"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
+msgid "Save Access Token in preferences"
+msgstr "Зберегти мітку доступу у налаштуваннях"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
+msgid ""
+"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
+"to use the Access Token in this JOSM session only.</html>"
+msgstr ""
+"<html>Позначте, щоб зберегти мітку доступу в налаштуваннях JOSM.<br>Зніміть "
+"позначку, щоб використати мітку доступу тільки в поточній сесії JOSM.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
+msgid "Use default settings"
+msgstr "Використовувати типові налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
+msgid "Consumer Key:"
+msgstr "Ключ користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
+msgid "Consumer Secret:"
+msgstr "Таємний ключ користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
+msgid "Request Token URL:"
+msgstr "Посилання для отримання мітки доступу:"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
+msgid "Access Token URL:"
+msgstr "Посилання мітки доступу:"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
+msgid "Authorize URL:"
+msgstr "Посилання для авторизації:"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
+msgid "Click to reset the OAuth settings to default values"
+msgstr "Натисніть, щоб скинути налаштування OAuth на типові"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
+msgid "Click to abort resetting to the OAuth default values"
+msgstr "Натисніть, щоб відмінити скидання налаштування OAuth на типові"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
+msgid ""
+"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
+"current custom settings are not saved.</html>"
+msgstr ""
+"<html>JOSM скинув налаштування OAuth на типові.<br>Попередні налаштування — "
+"не збережені.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
+msgid "Overwrite custom OAuth settings?"
+msgstr "Перезаписати власні налаштування OAuth?"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
+msgid "Fully automatic"
+msgstr "Автоматично"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61
+msgid "Semi-automatic"
+msgstr "Напівавтоматично"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64
+msgid "Manual"
+msgstr "Вручну"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
+msgid ""
+"<html>Run a fully automatic procedure to get an access token from the OSM "
+"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
+"fully<br>automatically authorizes the user and retrieves an Access Token.</"
+"html>"
+msgstr ""
+"<html>Запустити автоматичну процедуру отримання мітки доступу з веб-сайту "
+"OSM.<br>JOSM звернеться до веб-сайту OSM від імені користувача JOSM, "
+"повністю<br>автоматично авторизує користувача і отримає мітку доступу.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
+msgid ""
+"<html>Run a semi-automatic procedure to get an access token from the OSM "
+"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
+"and an<br>Access Token. It dispatches the user to the OSM website in an "
+"external browser<br>to authenticate itself and to accept the request token "
+"submitted by JOSM.</html>"
+msgstr ""
+"<html>Запустити напівавтоматичну процедуру  отримання мітки доступу з веб-"
+"сайту OSM.<br>При цьому JOSM надішле стандартні запити OAuth, запит для "
+"отримання мітки доступу та самої<br>мітки доступу. Користувач буде "
+"направлений на веб-сайт OSM за допомогою зовнішнього оглядача<br>щоб "
+"ідентифікуватись та отримати мітку запиту, надіслану з JOSM.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
+msgid ""
+"<html>Enter an Access Token manually if it was generated and retrieved "
+"outside<br>of JOSM.</html>"
+msgstr ""
+"<html>Введіть мітку доступу вручну, якщо вона була створена та отримана за "
+"межами<br>JOSM.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
+msgid ""
+"Please enter your OSM user name and password. The password will <strong>not</"
+"strong> be saved in clear text in the JOSM preferences and it will be "
+"submitted to the OSM server <strong>only once</strong>. Subsequent data "
+"upload requests don't use your password any more."
+msgstr ""
+"Будь ласка, введіть ваші ім'я користувача OSM і пароль.. Пароль <strong>не "
+"буде</strong> збережений у відкритому вигляді в налаштуваннях JOSM та буде "
+"переданий на сервер OSM <strong>тільки один раз</strong>. Всі подальші "
+"запити на надсилання на сервер даних більше не будуть використовувати ваш "
+"пароль."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:111
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
+msgid "Username: "
+msgstr "Користувач: "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:126
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
+msgid "Password: "
+msgstr "Пароль: "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:147
+msgid ""
+"<strong>Warning:</strong> The password is transferred <strong>once</strong> "
+"in clear text to the OSM website. <strong>Do not</strong> use a sensitive "
+"password until the OSM server provides an encrypted communication channel "
+"(HTTPS)."
+msgstr ""
+"<strong>Попередження:</strong> Пароль переданий <strong>один раз</strong> в "
+"чистому вигляді на веб-сайт OSM. <strong>Не використовуйте</strong> "
+"відкритий пароль до тих пір, доки сервер OSM підтримує шифровані канали "
+"зв’язку (HTTPS)."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:173
+msgid "Granted rights"
+msgstr "Надані права"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:174
+msgid "Advanced OAuth properties"
+msgstr "Розширені параметри OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:234
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:361
+msgid "Accept Access Token"
+msgstr "Прийняти мітку доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:235
+#, java-format
+msgid ""
+"<html>You have successfully retrieved an OAuth Access Token from the OSM "
+"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
+"in subsequent requests to gain access to the OSM API.</html>"
+msgstr ""
+"<html>Ви успішно отримали мітку доступу OAuth з веб-сайтауOSM. Натисніть на "
+"<strong>{0}</strong>, щоб прийняти мітку. JOSM буде використовувати його в "
+"майбутніх запитах на отримання доступу до OSM API.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:329
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
+msgid "Authorize now"
+msgstr "Авторизуватись"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:331
+msgid "Click to redirect you to the authorization form on the JOSM web site"
+msgstr "Натисніть, щоб перейти до форми авторизації на веб-сайті JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:361
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:274
+msgid "Back"
+msgstr "Назад"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:362
+msgid "Run the automatic authorization steps again"
+msgstr "Запустити процедуру автоматичної авторизації ще раз"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:376
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:231
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:436
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
+msgid "Test Access Token"
+msgstr "Перевірити мітку доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:405
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:95
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
+msgid "Please enter your OSM user name"
+msgstr "Будь ласка, введіть ваше ім'я користувача в OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:407
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:97
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
+msgid "The user name cannot be empty. Please enter your OSM user name"
+msgstr ""
+"Ім'я користувача не може бути порожнім. Будь ласка введіть Ваше ім'я "
+"користувача в OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:426
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
+msgid "Please enter your OSM password"
+msgstr "Будь ласка, введіть Ваш пароль OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:428
+msgid "The password cannot be empty. Please enter your OSM password"
+msgstr "Пароль не може бути порожнім. Будь ласка, введіть Ваш пароль OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:438
+msgid "Authorize JOSM to access the OSM API"
+msgstr "Авторизувати JOSM для отримання доступу до OSM API"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:452
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed.<br><br>Please try again or choose another kind of "
+"authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
+msgstr ""
+"<html>Не вдалося автоматично отримати мітку доступу OAuth<br>з сервера OSM."
+"<br><br>Будь ласка, спробуйте ще раз або виберіть інший процес авторизації,"
+"<br>наприклад, напівавтоматичний або авторизацію вручну.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:474
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:498
+msgid "OAuth authorization failed"
+msgstr "Збій OAuth авторизації"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:467
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed because JOSM was not able to build<br>a valid login URL "
+"from the OAuth Authorize Endpoint URL ''{0}''.<br><br>Please check your "
+"advanced setting and try again.</html>"
+msgstr ""
+"<html>Не вдалося автоматично отримати мітку доступу OAuth <br>з сервера OSM, "
+"тому що JOSM не зміг побудувати<br>вірне URL-посилання для входу з URL OAuth "
+"Authorize Endpoint ''{0}''.<br><br>Будь ласка, перевірте ваші розширені "
+"настройки і спробуйте ще раз.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:490
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
+"<html>Не вдалося автоматично отримати мітку доступу OAuth <br>з сервера OSM. "
+"Збій входу з JOSM у {0}<br>для користувача {1}.<br><br>Будь ласка, перевірте "
+"ім'я користувача та пароль і спробуйте ще раз.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
+#, java-format
+msgid ""
+"Please enter an OAuth Access Token which is authorized to access the OSM "
+"server ''{0}''."
+msgstr ""
+"Будь ласка, введіть мітку доступу OAuth, яка має дозвіл на доступ до сервера "
+"OSM ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
+msgid "Save Access Token to preferences"
+msgstr "Зберегти мітку доступу в налаштуваннях"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
+msgid "Access Token"
+msgstr "Мітка доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
+msgid "Advanced OAuth parameters"
+msgstr "Розширені параметри OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
+msgid "Enter the OAuth Access Token"
+msgstr "Введіть мітку доступу OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
+msgid "Enter advanced OAuth properties"
+msgstr "Введіть розширені параметри OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
+#, java-format
+msgid ""
+"<html><body>Please enter an OAuth Access Token which is authorized to access "
+"the OSM server ''{0}''.</body></html>"
+msgstr ""
+"<html><body>Будь ласка, введіть мітку доступу OAuth, яка має дозвіл на "
+"доступ до сервера OSM \"{0}\".</body></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
+msgid "Please enter an Access Token Key"
+msgstr "Будь ласка, введіть ключ мітки доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
+msgid ""
+"The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr ""
+"Ключ мітки доступу не повинен буди порожнім. Будь ласка, введіть ключ мітки "
+"доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
+msgid "Please enter an Access Token Secret"
+msgstr "Будь ласка, введіть таємний ключ мітки доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
+msgid ""
+"The Access Token Secret must not be empty. Please enter an Access Token "
+"Secret"
+msgstr ""
+"Таємний ключ мітки доступу не повинен буди порожнім. Будь ласка, введіть "
+"таємний ключ мітки доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:438
+msgid "Click to test the Access Token"
+msgstr "Натисніть, для перевірки мітки доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:115
+#, java-format
+msgid ""
+"With OAuth you grant JOSM the right to upload map data and GPS tracks on "
+"your behalf (<a href=\"{0}\">more info...</a>)."
+msgstr ""
+"За допомогою OAuth, ви дозволяєте JOSM надсилати на сервер дані мапи та "
+"треки GPS, від свого імені (<a href=\"{0}\">Докладно…</a>)."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:126
+msgid "Please select an authorization procedure: "
+msgstr "Будь ласка, виберіть спосіб авторизації: "
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:244
+#, java-format
+msgid "Get an Access Token for ''{0}''"
+msgstr "Отримати мітку доступу для ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:344
+msgid "Close the dialog and cancel authorization"
+msgstr "Закрити діалог і скасувати авторизацію"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:363
+msgid "Close the dialog and accept the Access Token"
+msgstr "Закрити діалог і прийняти мітку доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
+msgid "Warning: failed to cancel running OAuth operation"
+msgstr "Попередження: через збій відмінено запуск операції OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
+#, java-format
+msgid "Retrieving OAuth Request Token from ''{0}''"
+msgstr "Отримання мітки запиту OAuth з ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
+#, java-format
+msgid "Retrieving OAuth Access Token from ''{0}''"
+msgstr "Отримання мітки доступу OAuth з ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
+#, java-format
+msgid "OSM website did not return a session cookie in response to ''{0}'',"
+msgstr "Веб-сайт OSM не повернувся кукі сесії у відповідь на ''{0}'',"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
+#, java-format
+msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
+msgstr ""
+"Збій автентифікації користувача ''{0}'' з паролем «***», як користувача OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
+#, java-format
+msgid "Failed to authorize OAuth request  ''{0}''"
+msgstr "Збій авторизації запиту OAuth ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr "Авторизація мітки запиту OAuth ''{0}'' на веб-сайті OSM…"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+msgid "Initializing a session at the OSM website..."
+msgstr "Ініціалізація сесії на сайті OSM…"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
+#, java-format
+msgid "Authenticating the session for user ''{0}''..."
+msgstr "Автентифікація сесії для користувача ''{0}''…"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
+#, java-format
+msgid "Authorizing request token ''{0}''..."
+msgstr "Авторизація мітки запиту ''{0}''…"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
+#, java-format
+msgid "Logging out session ''{0}''..."
+msgstr "Вихід з сесії ''{0}''…"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
+msgid "Allow to upload map data"
+msgstr "Дозволити надсилання даних мапи"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
+msgid "Select to grant JOSM the right to upload map data on your behalf"
+msgstr ""
+"Виберіть, щоб дозволити JOSM надсилати дані мапи на сервер від вашого імені"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
+msgid "Allow to upload GPS traces"
+msgstr "Дозволити надсилати GPS-треки"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
+msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
+msgstr ""
+"Виберіть, щоб дозволити JOSM надсилати треки GPS на сервер від вашого імені"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
+msgid "Allow to download your private GPS traces"
+msgstr "Дозволити надсилати приватні GPS-треки"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
+msgid ""
+"Select to grant JOSM the right to download your private GPS traces into JOSM "
+"layers"
+msgstr ""
+"Виберіть, щоб дозволити JOSM завантажувати ваші приватні треки GPS в шари "
+"JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
+msgid "Allow to read your preferences"
+msgstr "Дозволити читати ваші налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
+msgid "Select to grant JOSM the right to read your server preferences"
+msgstr "Виберіть, щоб надати JOSM право читати ваші налаштування сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
+msgid "Allow to write your preferences"
+msgstr "Дозволити запис ваших налаштувань"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
+msgid "Select to grant JOSM the right to write your server preferences"
+msgstr "Виберіть, для надання JOSM прав на запис ваших налаштувань для сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
+msgid "Retrieving OAuth Access Token..."
+msgstr "Отримання мітки доступу OAuth…"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
+#, java-format
+msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
+msgstr "<html>Збій отримання мітки доступу OAuth з ''{0}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
+msgid "Request Failed"
+msgstr "Запит не вдався"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
+msgid "Retrieving OAuth Request Token..."
+msgstr "Отримання мітки запиту OAuth…"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
+#, java-format
+msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
+msgstr "<html>Збій отримання мітки запиту OAuth з ''{0}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:83
+msgid "Display Advanced OAuth Parameters"
+msgstr "Показати розширені параметри OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:166
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:369
+msgid "Retrieve Request Token"
+msgstr "Отримати мітку запиту"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
+#, java-format
+msgid ""
+"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
+"Token from ''{1}''.</html>"
+msgstr ""
+"<html>Будь ласка, натисніть на <strong>{0}</strong>, щоб отримати мітку "
+"запиту OAuth з ''{1}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
+msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
+msgstr "<html>Крок 1/3: Отримати мітку запиту OAuth</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205
+msgid "<html>Step 2/3: Authorize and retrieve an Access Token</html>"
+msgstr "<html>Крок 2/3: Авторизуватись та отримати мітку доступу</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
+msgid "Request Access Token"
+msgstr "Запит мітки доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
+#, java-format
+msgid ""
+"<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
+"authorization page in an external browser. Please login with your OSM "
+"username and password and follow the instructions to authorize the Request "
+"Token. Then switch back to this dialog and click on <strong>{0}</"
+"strong><br><br>If launching the external browser fails you can copy the "
+"following authorize URL and paste it into the address field of your browser."
+"</html>"
+msgstr ""
+"<html>JOSM успішно отримав мітку запиту. JOSM тепер відкриє сторінку "
+"авторизації у зовнішньому оглядачі. Будь ласка, увійдіть, використовуючи "
+"ім’я користувача та пароль OSM та слідуйте інструкціям, щоб авторизувати "
+"мітку запиту. Після цього поверніться назад до цього вікна та натисніть на "
+"<strong>{0}</strong><br><br>Якщо зовнішній оглядач не запуститься, ви "
+"зможете скопіювати наступний URL авторизації та вставити його в адресний "
+"рядок вашого оглядача.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
+msgid "Go back to step 1/3"
+msgstr "Поверніться до кроку 1/3"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
+msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
+msgstr "<html>Крок 3/3: Мітка доступу успішно отримана</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
+msgid ""
+"<html>JOSM has successfully retrieved an Access Token. You can now accept "
+"this token. JOSM will use it in the future for authentication and "
+"authorization to the OSM server.<br><br>The access token is: </html>"
+msgstr ""
+"<html>JOSM успішно отримав мітку доступу. Ви можете прийняти її. JOSM буде "
+"використовувати його для автентифікації та авторизації на сервері OSM."
+"<br><br>Мітка доступу: </html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
+msgid "Restart"
+msgstr "Перезапустити"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
+msgid "Click to retrieve a Request Token"
+msgstr "Натисніть, щоб отримати мітку доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
+msgid "Retrieve Access Token"
+msgstr "Отримати мітку доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
+msgid "Click to retrieve an Access Token"
+msgstr "Натисніть, щоб отримати мітку доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
+msgid "Testing OAuth Access Token"
+msgstr "Перевірка мітки доступу OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
+msgstr ""
+"Отримання даних користувача з Ключем мітки доступу ''{0}'' було відхилено."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
+#, java-format
+msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
+msgstr ""
+"Отримання даних користувача з Ключем мітки доступу ''{0}'' було заборонено."
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
+#, java-format
+msgid ""
+"<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
+"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
+"''{3}''.</html>"
+msgstr ""
+"<html>Мітка доступу ''{0}'' успішно використана для<br>доступу до сервера "
+"OSM ''{1}''.<br>Ви тепер маєте доступ до сервера OSM в якості користувача "
+"''{2}'' з ідентифікатором ''{3}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
+msgid "Success"
+msgstr "Успішно"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
+#, java-format
+msgid ""
+"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
+"''{0}''.<br>The server rejected the Access Token as unauthorized. You will "
+"not<br>be able to access any protected resource on this server using this "
+"token.</html>"
+msgstr ""
+"<html>Збій доступу до сервера OSM ''{0}''<br> за допомогою мітки доступу "
+"''{0}''.<br>Сервер відхилив мітку доступу, як неавторизовану. Ви не "
+"можете<br>отримати доступ до будь-яких захищених ресурсів на цьому сервері з "
+"цією міткою доступу.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:209
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:226
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
+msgid "Test failed"
+msgstr "Перевірку не пройдено"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
+#, java-format
+msgid ""
+"<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
+"test to retrieve the user details for this token failed, though."
+"<br>Depending on what rights are granted to this token you may nevertheless "
+"use it<br>to upload data, upload GPS traces, and/or access other protected "
+"resources.</html>"
+msgstr ""
+"<html>Мітка доступу ''{1}'' відома серверу OSM ''{0}''.<br>Однак, тест "
+"отримання даних користувача для цієї мітки не вдався.<br>Незалежно від того, "
+"які права має ця мітка, ви, все ж, можете використовувати її<br>для "
+"надсилання даних та GPS-треків на сервер, а також для доступу до інших "
+"захищених ресурсів.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
+msgid "Token allows restricted access"
+msgstr "Мітка має обмежений доступ"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
+#, java-format
+msgid ""
+"<html>Failed to retrieve information about the current user from the OSM "
+"server ''{0}''.<br>This is probably not a problem caused by the tested "
+"Access Token, but<br>rather a problem with the server configuration. "
+"Carefully check the server<br>URL and your Internet connection.</html>"
+msgstr ""
+"<html>Не вдалось отримати інформацію про поточного користувача з сервера OSM "
+"''{0}''.<br>Можливо, що це не проблема перевірки мітки доступу,<br>а скоріш "
+"проблема конфігурації сервера. Уважно перевірте<br>URL сервера та ваше "
+"з’єднання з інтернет.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
+#, java-format
+msgid ""
+"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
+"''{1}''.<br>The token ist probably invalid.</html>"
+msgstr ""
+"<html>Не вдалось підписати запит до сервера OSM ''{0}'' за допомогою мітки "
+"''{1}''.<br>Можливо, що список міток зіпсовано.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
+msgid ""
+"<html>The test failed because the server responded with an internal error."
+"<br>JOSM could not decide whether the token is valid. Please try again later."
+"</html>"
+msgstr ""
+"<html>Тест не пройшов, тому що сервер повідомив про внутрішню помилку."
+"<br>JOSM не зміг визначити достовірність мітки. Будь ласка,спробуйте пізніше."
+"</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
+msgid "Retrieving user info..."
+msgstr "Отримання інформації про користувача…"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
+msgid "Advanced Preferences"
+msgstr "Розширені налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
+msgid "Setting Preference entries directly. Use with caution!"
+msgstr "Безпосереднє встановлення налаштувань. Використовуйте з обережністю!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:43
+msgid "Search: "
+msgstr "Пошук: "
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:100
+msgid "Current value is default."
+msgstr "Поточне значення є типовим"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:102
+#, java-format
+msgid "Default value is ''{0}''."
+msgstr "Типове значення — ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
+msgid "Default value currently unknown (setting has not been used yet)."
+msgstr "Типове значення не відоме (параметр ще не використовувався)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:671
+msgid "Please select the row to edit."
+msgstr "Будь ласка, оберіть рядок для правки."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:230
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:196
+#, java-format
+msgid "New value for {0}"
+msgstr "Нове значення для {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:694
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
+msgid "Please select the row to delete."
+msgstr "Будь ласка, оберіть рядок для вилучення."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:269
+msgid "Enter a new key/value pair"
+msgstr "Введіть нову пару ключ/значення"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:33
+msgid "Display the Audio menu."
+msgstr "Показати меню Аудіо."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:34
+msgid "Label audio (and image and web) markers."
+msgstr "Підписувати мітки аудіо, картинок і вебу."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:35
+msgid "Display live audio trace."
+msgstr "Показати звукові підказки у реальному часі"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:36
+msgid "Create non-audio markers when reading GPX."
+msgstr "Створити не звукові мітки при обробці GPX даних"
+
+#. various methods of making markers on import audio
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:39
+msgid "Explicit waypoints with valid timestamps."
+msgstr "Точні точки шляху з дійсними часовими відбитками."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:40
+msgid "Explicit waypoints with time estimated from track position."
+msgstr "Точні точки шляху з орієнтовним часом з позиції на треку."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:41
+msgid "Named trackpoints."
+msgstr "Іменовані точки треку."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:42
+msgid "Modified times (time stamps) of audio files."
+msgstr "Змінений час (часові відбитки) аудіо-файлів."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:43
+msgid "Start of track (will always do this if no other markers available)."
+msgstr "Початок треку (завжди встановлювати, якщо інші мітки відсутні)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
+msgid "Show or hide the audio menu entry on the main menu bar."
+msgstr "Показати або сховати меню роботи зі звуком на панелі Головного меню."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
+msgid ""
+"Display a moving icon representing the point on the synchronized track where "
+"the audio currently playing was recorded."
+msgstr ""
+"Показати анімовану піктограму у точці треку, де був записаний звук, що зараз "
+"відтворюється."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
+msgid ""
+"Put text labels against audio (and image and web) markers as well as their "
+"button icons."
+msgstr ""
+"Вставте текстові позначки напроти аудіо (зображення чи веб) мітки, такі ж як "
+"на їх значках."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
+msgid ""
+"Automatically make a marker layer from any waypoints when opening a GPX "
+"layer."
+msgstr ""
+"Автоматично створювати шар міток з будь-яких точок шляху при відкритті GPX "
+"шару."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
+msgid "When importing audio, make markers from..."
+msgstr "При імпортуванні звуку, створювати мітки з…"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:75
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:80
+msgid "When importing audio, apply it to any waypoints in the GPX layer."
+msgstr ""
+"Коли імпортується звук, застосовувати його для будь-яких шляхових точок із "
+"шару GPX."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
+msgid ""
+"Automatically create audio markers from trackpoints (rather than explicit "
+"waypoints) with names or descriptions."
+msgstr ""
+"Автоматично створювати звукові мітки з точок треку (замість точних точок "
+"шляху) з іменами або описами."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
+msgid ""
+"Create audio markers at the position on the track corresponding to the "
+"modified time of each audio WAV file imported."
+msgstr ""
+"Створити звукові мітки в положенні на треку, відповідному часу зміни кожного "
+"імпортованого звукового файлу WAV."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
+msgid ""
+"The number of seconds to jump forward or back when the relevant button is "
+"pressed"
+msgstr ""
+"Показує, на скільки секунд вперед або назад слід перейти при натисканні "
+"відповідної кнопки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
+msgid "Forward/back time (seconds)"
+msgstr "Вперед/Назад час (в секундах)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:104
+msgid "The amount by which the speed is multiplied for fast forwarding"
+msgstr ""
+"Показує, у скільки разів збільшується швидкість при швидкому програванні"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:105
+msgid "Fast forward multiplier"
+msgstr "Коефіцієнт швидкого програвання"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
+msgid ""
+"Playback starts this number of seconds before (or after, if negative) the "
+"audio track position requested"
+msgstr ""
+"Відтворення почнеться через цю кількість секунд до (або після, у разі "
+"від’ємного значення) запитаної позиції аудіозапису"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
+msgid "Lead-in time (seconds)"
+msgstr "Тривалість вступу (у секундах)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:114
+msgid "The ratio of voice recorder elapsed time to true elapsed time"
+msgstr "Відношення часу диктофонного запису до дійсно витраченого часу"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:115
+msgid "Voice recorder calibration"
+msgstr "Калібрування звукозапису"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
+msgid "Color"
+msgstr "Колір"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
+#, java-format
+msgid "Paint style {0}: {1}"
+msgstr "Стиль зафарбовування {0}:{1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
+msgid "Choose"
+msgstr "Вибрати"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
+#, java-format
+msgid "Choose a color for {0}"
+msgstr "Виберіть колір для {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
+msgid "Set to default"
+msgstr "Встановити типове значення"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
+msgid "Set all to default"
+msgstr "Встановити типові значення"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
+msgid "Colors used by different objects in JOSM."
+msgstr "Кольори, які використовуються різними об'єктами у JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
+msgid "Colors"
+msgstr "Кольори"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:274
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:277
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:308
+msgid "All"
+msgstr "Всі"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:37
+msgid "Local files"
+msgstr "Локальні файли"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:38
+msgid "None"
+msgstr "Нічого"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:42
+msgid "Force lines if no segments imported."
+msgstr "Показувати лінії, навіть якщо немає імпортованих відрізків."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:43
+msgid "Draw large GPS points."
+msgstr "Показувати GPS великими точками"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:150
+msgid "Draw a circle form HDOP value."
+msgstr ""
+"Показати значення HDOP (зниження точності в горизонтальній площині) колом."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+msgid "Velocity (red = slow, green = fast)"
+msgstr "Швидкість (червоний = повільно, зелений = швидко)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+msgid "Dilution of Position (red = high, green = low, if available)"
+msgstr "Розведення Позицій (червоний = високо, зелений = низько, якщо такі є)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
+msgid "Single Color (can be customized for named layers)"
+msgstr "Одним кольором (може бути визначено для іменованих шарів)"
+
+#. item "Aerialway/Pylon" text "Name"
+#. <separator/>
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1323
+msgid "Car"
+msgstr "Автомобіль"
+
+#. item "Barriers/Bollard" check "Foot"
+#. item "Barriers/Cattle Grid" check "Foot"
+#. item "Barriers/Spikes" check "Foot"
+#. item "Barriers/Border Control" check "Foot"
+#. item "Barriers/Entrance" check "Foot"
+#. item "Barriers/Gate" check "Foot"
+#. item "Barriers/Lift Gate" check "Foot"
+#. item "Barriers/Hampshire Gate" check "Foot"
+#. item "Barriers/Bump Gate" check "Foot"
+#. item "Barriers/Kissing Gate" check "Foot"
+#. item "Barriers/Stile" check "Foot"
+#. item "Barriers/Turnstile" check "Foot"
+#. item "Barriers/Sally Port" check "Foot"
+#. item "Car/Sharing" text "Operator"
+#. item "Public Transport/Subway Entrance" check "Wheelchair"
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
+msgid "Bicycle"
+msgstr "Вело"
+
+#. item "Ways/Path" check "Oneway"
+#. item "Barriers/Bollard" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Cattle Grid" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Spikes" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Border Control" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Entrance" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Lift Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Hampshire Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Bump Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Kissing Gate" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Stile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Turnstile" label "Allowed traffic:"
+#. <space />
+#. item "Barriers/Sally Port" label "Allowed traffic:"
+#. <space />
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
+msgid "Foot"
+msgstr "Пішки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+msgid "Draw Direction Arrows"
+msgstr "Показувати стрілки напрямку"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
+msgid "Fast drawing (looks uglier)"
+msgstr "Швидке креслення (виглядає гірше)"
+
+#. only interesting directions
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:226
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+"Показувати тільки корисні підказки напряму (наприклад - з теґом дороги з "
+"одностороннім рухом)."
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:232
+msgid "Only on the head of a way."
+msgstr "Тільки на початку лінії."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+msgid "Draw segment order numbers"
+msgstr "Показувати порядкові номери відрізків"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+msgid "Draw boundaries of downloaded data"
+msgstr "Показувати межі завантажених даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+msgid "Draw virtual nodes in select mode"
+msgstr "Показувати віртуальні точки в режимі вибору"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+msgid "Draw inactive layers in other color"
+msgstr "Показувати неактивні шари іншим кольором"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
+msgid "Smooth map graphics (antialiasing)"
+msgstr "Згладжені лінії (антіаліасінг)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:83
+msgid "Draw lines between raw GPS points"
+msgstr "Показувати лінії між точками GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+msgid ""
+"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
+"draw all lines."
+msgstr ""
+"Максимальна довжина ліній (в метрах) для локальних файлів. Встановіть «-1» "
+"щоб показувати всі лінії."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
+msgid "Maximum length for local files (meters)"
+msgstr "Максимальна довжина для локальних файлів (в метрах)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+msgid ""
+"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
+msgstr ""
+"Максимальна довжина (у метрах) ліній для показу. Встановіть «-1» щоб "
+"показувати всі лінії."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
+msgid "Maximum length (meters)"
+msgstr "Максимальна довжина (в метрах)"
+
+#. forceRawGpsLines
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
+msgid ""
+"Force drawing of lines if the imported data contain no line information."
+msgstr "Показувати лінії, навіть якщо немає імпортованої інформації про лінії."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
+msgid "Draw direction arrows for lines, connecting GPS points."
+msgstr "Показувати стрілки на лініях, що з'єднують точки GPS."
+
+#. drawGpsArrowsFast
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
+msgid "Draw the direction arrows using table lookups instead of complex math."
+msgstr ""
+"Показувати стрілки напрямку, використовуючи таблиці, замість математичних "
+"обчислень."
+
+#. drawGpsArrowsMinDist
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
+msgid ""
+"Do not draw arrows if they are not at least this distance away from the last "
+"one."
+msgstr ""
+"Не показувати стрілки, якщо вони знаходяться близько від попередніх стрілок"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
+msgid "Minimum distance (pixels)"
+msgstr "Мінімальна відстань (в пікселях)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:155
+msgid "Draw larger dots for the GPS points."
+msgstr "Показувати точки GPS великими."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+msgid ""
+"All points and track segments will have the same color. Can be customized in "
+"Layer Manager."
+msgstr ""
+"Однаковий колір у всіх точок і відрізків треку. Колір може бути визначений в "
+"Менеджері Шарів."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
+msgid "Colors points and track segments by velocity."
+msgstr "Позначати колір відрізків та точок треку в залежності від швидкості."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
+msgid ""
+"Colors points and track segments by dilution of position (HDOP). Your "
+"capture device needs to log that information."
+msgstr ""
+"Кольори точок і сегментів треку залежать від \"зниження точності\" (HDOP). "
+"Ваш пристрій захоплення для цього повинен реєструвати таку інформацію."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:189
+msgid "Allows to tune the track coloring for different average speeds."
+msgstr "Дозволяє настроювати забарвлення треку для різних середніх швидкостей."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:194
+msgid "Track and Point Coloring"
+msgstr "Забарвлення треку та точок"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:203
+msgid "GPS Points"
+msgstr "Точки GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:221
+msgid "Draw direction hints for way segments."
+msgstr "Показувати напрямок на відрізках ліній."
+
+#. segment order number
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:238
+msgid "Draw the order numbers of all segments within their way."
+msgstr "Показувати порядкові номери на всіх відрізках лінії."
+
+#. antialiasing
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:243
+msgid "Apply antialiasing to the map view resulting in a smoother appearance."
+msgstr "Застосувати згладжування мапи."
+
+#. downloaded area
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:248
+msgid "Draw the boundaries of data loaded from the server."
+msgstr "Показувати межі ділянки, завантаженої з сервера."
+
+#. virtual nodes
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:253
+msgid "Draw virtual nodes in select mode for easy way modification."
+msgstr ""
+"Показувати віртуальні точки в режимі вибору, для зручності редагування."
+
+#. background layers in inactive color
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+msgid "Draw the inactive data layers in a different color."
+msgstr "Показувати неактивні шари даних іншим кольором."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:265
+msgid "OSM Data"
+msgstr "Дані OSM"
+
+#. Show splash screen on startup
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:38
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:79
+msgid "Show splash screen at startup"
+msgstr "Показати заставку під час запуску"
+
+#. Show ID in selection
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:39
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:84
+msgid "Show object ID in selection lists"
+msgstr "Показувати ідентифікатор об'єктів у списку вибору"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
+msgid "Show localized name in selection lists"
+msgstr "Показати локалізовані назви в переліку вибору"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:93
+msgid "Draw rubber-band helper line"
+msgstr "Показувати «гумову» допоміжну лінію"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:42
+msgid "Modeless working (Potlatch style)"
+msgstr "Безрежимна робота (в стилі Potlatch)"
+
+#. Show localized names
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89
+msgid "Show localized name in selection lists, if available"
+msgstr "Показати локалізовані назви у списках вибору, якщо можливо"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
+msgid "Do not require to switch modes (potlatch style workflow)"
+msgstr "Не вимагає перемикання режимів (робочий стиль potlatch)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:109
+msgid "Look and Feel"
+msgstr "Зовнішній вигляд"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:45
+msgid "Language"
+msgstr "Мова"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/LanguagePreference.java:103
+msgid "Default (Auto determined)"
+msgstr "Типова (Автовизначення)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:35
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:42
+msgid "Enable built-in defaults"
+msgstr "Використовувати типові налаштування"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:37
+msgid "Enable built-in icon defaults"
+msgstr "Використовувати типові значки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:63
+msgid "Used style"
+msgstr "Використовується стиль"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
+msgid "Map Paint Styles"
+msgstr "Стиль кольорів мапи"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:73
+#, java-format
+msgid "The following plugin has been downloaded <strong>successfully</strong>:"
+msgid_plural ""
+"The following {0} plugins have been downloaded <strong>successfully</strong>:"
+msgstr[0] "Цей втулок було <strong>успішно</strong> завантажено з сервера:"
+msgstr[1] "Ці {0} втулки було <strong>успішно</strong> завантажено з сервера:"
+msgstr[2] "Ці {0} втулків було <strong>успішно</strong> завантажено з сервера:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
+#, java-format
+msgid "Downloading the following plugin has <strong>failed</strong>:"
+msgid_plural ""
+"Downloading the following {0} plugins has <strong>failed</strong>:"
+msgstr[0] "<strong>Збій</strong> завантаження втулку:"
+msgstr[1] "<strong>Збій</strong> завантаження {0} втулків:"
+msgstr[2] "<strong>Збій</strong> завантаження {0} втулків:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
+msgid "Search:"
+msgstr "Знайти:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
+msgid "Enter a search expression"
+msgstr "Введіть текст для пошуку"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
+msgid "Plugin update policy"
+msgstr "Правила оновлення втулка"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:194
+msgid "Accept the new plugin sites and close the dialog"
+msgstr "Призначити нові сайти для втулків та закрити діалог"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
+msgid "Configure Plugin Sites"
+msgstr "Налаштувати сайти втулків"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:274
+msgid "Download list"
+msgstr "Завантажити список"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:275
+msgid "Download the list of available plugins"
+msgstr "Завантажити список доступних втулків"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:321
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:344
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:192
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:237
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:665
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:833
+msgid "Update plugins"
+msgstr "Оновити втулки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:304
+msgid "Update the selected plugins"
+msgstr "Оновити обрані втулки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:315
+msgid "Please restart JOSM to activate the downloaded plugins."
+msgstr "Будь ласка, перезавантажте JOSM, щоб активувати завантажені втулки."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:331
+msgid ""
+"All installed plugins are up to date. JOSM does not have to download newer "
+"versions."
+msgstr ""
+"Всі встановлені втулки в актуальному стані. JOSM не доведеться завантажувати "
+"нові версії."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:332
+msgid "Plugins up to date"
+msgstr "Втулки в актуальному стані"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:400
+msgid "Configure sites..."
+msgstr "Налаштувати сайти…"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:401
+msgid "Configure the list of sites where plugins are downloaded from"
+msgstr "Налаштувати список серверів, з яких можна завантажити втулки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:463
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:475
+msgid "Add JOSM Plugin description URL."
+msgstr "Додати посилання на опис втулка JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:476
+msgid "Enter URL"
+msgstr "Введіть URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:489
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:512
+msgid "Please select an entry."
+msgstr "Будь ласка, виберіть запис."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:497
+msgid "Edit JOSM Plugin description URL."
+msgstr "Редагувати посилання на опис втулка JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:498
+msgid "JOSM Plugin description URL"
+msgstr "Посилання на опис втулка JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+msgid "disabled"
+msgstr "вимкнено"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
+msgid "no modifier"
+msgstr "модифікатор відсутній"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
+msgstr "<h1><a name=\"top\">Сполучення клавіш</a></h1>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
+msgid ""
+"<p>Please note that shortcut keys are assigned to the actions when JOSM is "
+"started. So you need to <b>restart</b> JOSM to see your changes.</p>"
+msgstr ""
+"<p>Зверніть увагу, що сполученню клавіш, призначаються дії, під час запуску "
+"JOSM. Тож вам треба <b>перезапустити</b> JOSM щоб побачити зміни.</p>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
+msgid ""
+"<p>Furthermore, the shortcuts are activated when the actions are assigned to "
+"a menu entry of a button for the first time. So some of your changes may "
+"become active even without restart --- but also without collision handling. "
+"This is another reason to <b>restart</b> JOSM after making any changes here."
+"</p>"
+msgstr ""
+"<p>Більш того, сполучення клавіші активізуються відразу, якщо вони "
+"призначені пунктам меню та кнопкам з самого початку. Отже деякі зміни можуть "
+"стати активними і без перезапуску — але без аналізу колізій. Ось чому краще "
+"<b>перезапустити</b> JOSM після внесення тут будь-яких змін.</p>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
+msgid ""
+"<p>You may notice that the key selection list on the next page lists all "
+"keys that exist on all kinds of keyboards Java knows about, not just those "
+"keys that exist on your keyboard. Please only use values that correspond to "
+"a real key on your keyboard. If your keyboard has no ''Copy'' key (PC "
+"keyboard do not have them, Sun keyboards do), then do not use it. Also there "
+"are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. "
+"'':''/Colon). Please do not use them either, use the base key ('';''/"
+"Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. "
+"Not doing so may result in conflicts, as there is no way for JOSM to know "
+"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard.</"
+"p>"
+msgstr ""
+"<p>Ви можете помітити, що список вибраних клавіш на наступній сторінці, "
+"перераховує всі клавіші, які присутні на всіх типах клавіатур, про які знає "
+"Java, а не тільки ті клавіші, які є на вашій клавіатурі. Будь ласка, "
+"використовуйте тільки ті значення, які дійсно є на вашій клавіатурі. Якщо на "
+"вашій клавіатурі немає клавіші''Copy'' (її немає на клавіатурі PC, але є на "
+"клавіатурі Sun), то не використовуйте її. Те ж саме стосується і до "
+"комбінацій клавішам, що відповідають вашій клавіатурі (наприклад: '':''/"
+"двокрапка). Будь ласка, не використовуйте їх, або використовуйте замість "
+"цього базові клавіші ('';''/крапка з комою на клавіатурах US, ''.''/точка на "
+"клавіатурах German, і т.д.). Якщо ви не зробите так, можуть виникнути "
+"конфлікти, так як JOSM не розуміє, що Ctrl+Shift+; це теж  саме, що й Ctrl+: "
+"на клавіатурі US.</p>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+msgid "<h1>Modifier Groups</h1>"
+msgstr "<h1>Групи модифікаторів</h1>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
+msgid ""
+"<p>The last page lists the modifier keys JOSM will automatically assign to "
+"shortcuts. For every of the four kinds of shortcuts there are three "
+"alternatives. JOSM will try those alternatives in the listed order when "
+"managing a conflict. If all alternatives result in shortcuts that are "
+"already taken, it will assign a random shortcut instead.</p>"
+msgstr ""
+"<p>На останній сторінці наведені клавіші-модифікатори JOSM, які будуть "
+"автоматично призначені сполученням клавіш. Для кожного з чотирьох типів "
+"сполучень клавіш є три варіанти. JOSM спробує їх, у зазначеному порядку, під "
+"час опрацювання конфлікту. Якщо всі варіанти сполучень клавіш будуть "
+"зайняті, буде призначена випадкова комбінація.</p>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
+msgid ""
+"<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
+"encountered.</p>"
+msgstr "<p>Псевдо-модифікатор ''відключено'' вимикає комбінацію клавіш.</p>"
+
+#. scroll up
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
+msgid "Read First"
+msgstr "Прочитай спочатку"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
+msgid "Use default"
+msgstr "Використовувати типові параметри"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
+msgid "Disable"
+msgstr "Вимкнути"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
+msgid "Key:"
+msgstr "Клавіша:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
+msgid "Attention: Use real keyboard keys only!"
+msgstr "Увага: Використовуйте лише присутні на клавіатурі клавіші!"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
+msgid "Keyboard Shortcuts"
+msgstr "Сполучення клавіш"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
+msgid "Edit Shortcuts"
+msgstr "Правити сполучення клавіш"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
+msgid "Primary modifier:"
+msgstr "Основний модифікатор:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
+msgid "Secondary modifier:"
+msgstr "Другий модифікатор:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
+msgid "Tertiary modifier:"
+msgstr "Третій модифікатор:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
+msgid "Menu Shortcuts"
+msgstr "Сполучення клавіш меню"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
+msgid "Hotkey Shortcuts"
+msgstr "Сполучення гарячих клавіш"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
+msgid "Subwindow Shortcuts"
+msgstr "Сполучення клавіш підменю"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
+msgid "Modifier Groups"
+msgstr "Групи модифікаторів"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
+msgid "Close the preferences dialog and discard preference updates"
+msgstr "Закрити діалог налаштувань і скасувати внесені зміни"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
+msgid "Save the preferences and close the dialog"
+msgstr "Зберегти налаштування і закрити діалог"
+
+#. some common tabs
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:49
+msgid "Display Settings"
+msgstr "Налаштування екрану"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:49
+msgid ""
+"Various settings that influence the visual representation of the whole "
+"program."
+msgstr "Різні налаштування, що впливають на зовнішній вигляд програми."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:50
+msgid "Connection Settings"
+msgstr "Параметри з’єднання"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:50
+msgid "Connection Settings for the OSM server."
+msgstr "Параметри з'єднання з сервером OSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:51
+msgid "Map Settings"
+msgstr "Налаштування мапи"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:51
+msgid "Settings for the map projection and data interpretation."
+msgstr "Налаштування проекції мапи та інтерпретації даних."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52
+msgid "Audio Settings"
+msgstr "Налаштування звуку"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:52
+msgid "Settings for the audio player and audio markers."
+msgstr "Налаштування аудіо-програвача та звукових міток."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:53
+msgid "Configure available plugins."
+msgstr "Налаштування доступних втулків."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:119
+msgid "Download plugins"
+msgstr "Завантажити втулки"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:151
+msgid "You have to restart JOSM for some settings to take effect."
+msgstr "Потрібно перезапустити JOSM, щоб зміни набрали сили."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
+msgid "Display coordinates as"
+msgstr "Показувати координати як"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
+msgid "Projection method"
+msgstr "Тип проекції"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
+msgid "Projection code"
+msgstr "Код проекції"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
+msgid "Map Projection"
+msgstr "Картографічна проекція"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
+#, java-format
+msgid "The projection {0} could not be activated. Using Mercator"
+msgstr "Неможливо активувати проекцію {0}. Використовується проекція Меркатора"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
+msgid "Authentication"
+msgstr "Автентифікація"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
+msgid "Proxy settings"
+msgstr "Параметри проксі сервера"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
+msgid "File backup"
+msgstr "Резервне копіювання файлів"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
+msgid "Configure your identity and how to authenticate at the OSM server"
+msgstr "Задати ваші дані і визначити спосіб ідентифікації на сервері OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
+msgid "Configure whether to use a proxy server"
+msgstr "Вказати, чи використовуєте ви проксі-сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
+msgid "Configure whether to create backup files"
+msgstr "Вказати, чи будете ви створювати резервні файли"
+
+#. 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
+#. icon licence: GPL
+#. icon designer: Paolino, http://www.paolinoland.it/
+#. icon original filename: keyboard.png
+#. icon original size: 128x128
+#. modifications: icon was cropped, then resized
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:29
+msgid "Shortcut Preferences"
+msgstr "Налаштування сполучення клавіш"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:30
+msgid "Changing keyboard shortcuts manually."
+msgstr "Змінити сполучення клавіш вручну"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
+msgid "Action"
+msgstr "Дія"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
+msgid "Shortcut"
+msgstr "Комбінація клавіш"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:156
+msgid "Active styles"
+msgstr "Активні стилі"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:166
+#, java-format
+msgid "Available styles (from {0})"
+msgstr "Доступні стилі (з {0})"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:172
+msgid "Icon paths"
+msgstr "Шлях до значків"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:408
+#, java-format
+msgid "Short Description: {0}"
+msgstr "Короткий опис: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:408
+#, java-format
+msgid "URL: {0}"
+msgstr "URL: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:410
+#, java-format
+msgid "Author: {0}"
+msgstr "Автор: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:413
+#, java-format
+msgid "Webpage: {0}"
+msgstr "Веб-сторінка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:419
+#, java-format
+msgid "Version: {0}"
+msgstr "Версія: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:433
+msgid "Add a filename or an URL of an active style"
+msgstr "Додати ім'я файлу або URL активного стилю"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:448
+msgid "Remove the selected styles from the list of active styles"
+msgstr "Вилучити вибраний стиль зі списку активних стилів"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:469
+msgid "Edit the filename or URL for the selected active style"
+msgstr "Змінити ім'я файлу або URL для вибраного активного стилю"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:491
+msgid "Add the selected available styles to the list of active styles"
+msgstr "Додати виділені доступні стилі до списку активних стилів"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:514
+#, java-format
+msgid "Reloads the list of available styles from ''{0}''"
+msgstr "Перезавантажити список доступних стиоів з ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:625
+msgid "Add a new icon path"
+msgstr "Додати новий шлях до піктограм"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:638
+msgid "Remove the selected icon paths"
+msgstr "Вилучити виділені шляхи до піктограм"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:659
+msgid "Edit the selected icon path"
+msgstr "Змінити виділений шлях до піктограм"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:704
+#, java-format
+msgid "Loading style sources from ''{0}''"
+msgstr "Завантаження джерел стилів з ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:726
+#, java-format
+msgid ""
+"<html>Failed to load the list of style sources from<br>''{0}''."
+"<br><br>Details (untranslated):<br>{1}</html>"
+msgstr ""
+"<html>Не вдалось завантажити список джерел стилів з<br>''{0}''."
+"<br><br>Тонкощі (англ.):<br>{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:766
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:798
+#, java-format
+msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
+msgstr ""
+"Попередження: неправильний формат або запис у списку стилів ''{0}''. "
+"Отримано ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:40
+msgid "Sort presets menu"
+msgstr "Сортувати меню заготовок"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:52
+msgid "Tagging Presets"
+msgstr "Заготовки теґів"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:266
+msgid "Actions"
+msgstr "Дії"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:396
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:418
+msgid "Separator"
+msgstr "Розділювач"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:580
+msgid "Toolbar"
+msgstr "Панель інструментів"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:584
+msgid "Available"
+msgstr "Доступний"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:623
+msgid "Action parameters"
+msgstr "Параметри дії"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:624
+msgid "Parameter name"
+msgstr "Назва параметру"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:625
+msgid "Parameter value"
+msgstr "Значення параметру"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:630
+msgid "Toolbar customization"
+msgstr "Налаштування панелі інструментів"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:631
+msgid "Customize the elements on the toolbar."
+msgstr "Налаштувати елементи панелі інструментів."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:63
+msgid "Plugin bundled with JOSM"
+msgstr "Втулок, що постачається з JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:80
+msgid ""
+"Please click on <strong>Download list</strong> to download and display a "
+"list of available plugins."
+msgstr ""
+"Натисніть на кнопку <strong>Завантажити список з сервера</strong>, щоб "
+"отримати список доступних втулків."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:108
+#, java-format
+msgid "{0}: Version {1} (local: {2})"
+msgstr "{0}: Версія {1} (встановлена: {2})"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:72
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113
+msgid "Ask before updating"
+msgstr "Питати перед оновленням"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:76
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:118
+msgid "Always update withouth asking"
+msgstr "Завжди оновлювати не питаючи"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:123
+msgid "Never update"
+msgstr "Не оновлювати"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:84
+msgid ""
+"Please decide whether JOSM shall automatically update active plugins at "
+"startup after an update of JOSM itself."
+msgstr ""
+"Будь ласка вирішите, чи потрібно автоматично оновлювати встановлені втулки, "
+"після завантаження нової версії JOSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96
+msgid "Update interval (in days):"
+msgstr "Інтервал оновлення (у днях):"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128
+msgid ""
+"Please decide whether JOSM shall automatically update active plugins after a "
+"certain periode of time."
+msgstr ""
+"Будь ласка вирішите, чи потрібно автоматично час від часу оновлювати "
+"встановлені втулки."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
+#, java-format
+msgid "Testing OSM API URL ''{0}''"
+msgstr "Перевірка URL OSM API ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
+#, java-format
+msgid ""
+"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
+"validate again.</html>"
+msgstr ""
+"<html>''{0}'' є невірним URL OSM API.<br>Будь ласка, перевірте правильність "
+"написання і спробуйте ще раз.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
+msgid "Invalid API URL"
+msgstr "Невірний URL API"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
+#, java-format
+msgid ""
+"<html>Failed to build URL ''{0}'' for validating the OSM API server."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+"<html>Не вдалося побудувати URL ''{0}'' для оцінки сервера OSM API.<br>Будь "
+"ласка, перевірте правильність написання ''{1}'' та спробуйте знов.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
+#, java-format
+msgid ""
+"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
+"''{1}'' and your Internet connection and validate again.</html>"
+msgstr ""
+"<html>Не вдалось перейти по URL ''{0}''.<br>Будь ласка, перевірте написання "
+"''{1}'', а також ваше інтернет з’єднання, а потім спробуйте знов.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:115
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
+msgid "Connection to API failed"
+msgstr "Підключення до API не вдалося"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
+#, java-format
+msgid ""
+"<html>Failed to retrieve a list of changesets from the OSM API server "
+"at<br>''{1}''. The server responded with the return code {0} instead of 200."
+"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgstr ""
+"<html>Не вдалось отримати список наборів змін з сервера OSM API <br>''{1}''. "
+"Сервер повернув код {0} замість коду 200.<br>Будь ласка, перевірте "
+"правильність написання ''{1}'' та спробуйте знов.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
+#, java-format
+msgid ""
+"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
+"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
+"spelling of ''{0}'' and validate again.</html>"
+msgstr ""
+"<html>Сервер OSM API ''{0}'' повернув неправильну відповідь.<br>Схоже, що "
+"''{0}'' це не сервер OSM API.<br>Будь ласка, перевірте правильність "
+"написання ''{0}'' та спробуйте знов..</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
+msgid "Use Basic Authentication"
+msgstr "Використовувати базову автентифікацію"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
+msgid ""
+"Select to use HTTP basic authentication with your OSM username and password"
+msgstr ""
+"Виберіть, щоб використовувати базову автентифікацію HTTP з Вашим ім'ям "
+"користувача та паролем OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
+msgid "Use OAuth"
+msgstr "Використовувати OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
+msgid "Select to use OAuth as authentication mechanism"
+msgstr "Вибрати для використання OAuth, як механізму перевірки автентичності"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
+#, java-format
+msgid ""
+"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
+"authentication method ''Basic Authentication''."
+msgstr ""
+"Попередження: непідтримуване значення у параметрі ''{0}'', отримано ''{1}''. "
+"Використовується метод «Базової автентифікації»."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
+msgid "Keep backup files"
+msgstr "Зберігати резервні копії"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:31
+msgid "When saving, keep backup files ending with a ~"
+msgstr "При збереженні, зберігати резервні копії з розширенням ~"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
+msgid "OSM username:"
+msgstr "Ім’я в OSM:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
+msgid "OSM password:"
+msgstr "Пароль в OSM:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
+msgid ""
+"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
+"is stored in plain text in the JOSM preferences file. Furthermore, it is "
+"transferred <strong>unencrypted</strong> in every request sent to the OSM "
+"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Попередження:</strong>В цьому "
+"режимі, пароль зберігається у вигляді звичайного тексту у файлі налаштувань "
+"JOSM. Крім того, він передається у кожному запиті на сервер OSM в "
+"<strong>незашифрованому</strong> вигляді. <strong>Не використовуйте тут "
+"важливих паролів.</strong></p></body></html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
+msgid "Warning: failed to retrieve OSM credentials from credential manager."
+msgstr ""
+"Попередження: не вдалося отримати облікові дані OSM від менеджера облікових "
+"даних."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:183
+#, java-format
+msgid "Current credential manager is of type ''{0}''"
+msgstr "Поточний менеджер облікових записів має тип ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:139
+msgid "Warning: failed to save OSM credentials to credential manager."
+msgstr ""
+"Попередження: Не вдалося зберегти облікові дані OSM в менеджері облікових "
+"даних."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:151
+msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
+msgstr ""
+"Попередження: Не вдалося отримати мітку доступу OAuth від менеджера "
+"облікових даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:182
+msgid "Warning: Failed to store OAuth Access Token to credentials manager"
+msgstr ""
+"Попередження: Не вдалося зберегти мітку доступу OAuth в менеджері облікових "
+"даних"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:187
+msgid ""
+"You do not have an Access Token yet to access the OSM server using OAuth. "
+"Please authorize first."
+msgstr ""
+"Ви не маєте мітки доступу, щоб отримати доступ до сервера OSM за допомогою "
+"OAuth. Будь ласка, спочатку авторизуйтесь."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
+msgid "You already have an Access Token to access the OSM server using OAuth."
+msgstr ""
+"Ви вже маєте мітку доступу для доступу до сервера OSM за допомогою OAuth."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
+msgid "Save to preferences"
+msgstr "Зберегти в налаштуваннях"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:307
+msgid "Click to step through the OAuth authorization process"
+msgstr "Натисніть, щоб крок за кроком пройти процес авторизації OAuth"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
+msgid "New Access Token"
+msgstr "Нова мітка доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:332
+msgid ""
+"Click to step through the OAuth authorization process and generate a new "
+"Access Token"
+msgstr ""
+"Натисніть, щоб пройти процес авторизації OAuth та створити мітку доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:357
+msgid "Click test access to the OSM server with the current access token"
+msgstr ""
+"Натисніть, щоб перевірити доступ до сервера OSM з поточною міткою доступу"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:62
+#, java-format
+msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
+msgstr "<html>Використовувати типовий сервер OSM (<strong>{0}</strong>)</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
+msgid "OSM Server URL:"
+msgstr "URL сервера OSM:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
+msgid "Validate"
+msgstr "Перевірити"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:153
+msgid "Test the API URL"
+msgstr "Перевірити URL API"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:169
+msgid "The API URL is valid."
+msgstr "URL API верне."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:174
+msgid "Validation failed. The API URL seems to be invalid."
+msgstr "Перевірку не здійснено. URL API виглядає невірним."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:235
+msgid "OSM API URL must not be empty. Please enter the OSM API URL."
+msgstr "URL OSM API не повинно бути порожнім. Будь ласка, введіть URL OSM API."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
+msgid "The current value is not a valid URL"
+msgstr "Поточне значення — невірне URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:241
+msgid "Please enter the OSM API URL."
+msgstr "Будь ласка, введіть URL OSM API."
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:104
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:179
+msgid "Host:"
+msgstr "Хост:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:189
+msgctxt "server"
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:126
+msgid ""
+"Please enter a username and a password if your proxy requires authentication."
+msgstr ""
+"Вкажіть ім'я користувача та пароль, якщо ваш проксі-сервер вимагає "
+"автентифікації користувача"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
+msgid "No proxy"
+msgstr "Без проксі"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:242
+msgid "Use standard system settings"
+msgstr "Використовувати стандартні налаштування системи"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
+msgid ""
+"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
+"useSystemProxies=true</tt> to enable)"
+msgstr ""
+"Використовувати стандартні системні налаштування (заблоковано. Запустіть "
+"JOSM з параметром<tt>-Djava.net.useSystemProxies=true</tt> для розблокування)"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
+msgid "Manually configure a HTTP proxy"
+msgstr "Ручне налаштування HTTP-проксі"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:274
+msgid "Use a SOCKS proxy"
+msgstr "Використовувати SOCKS-проксі"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:316
+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 ""
+"Увага: JOSM налаштований на використання системних налаштувань проксі, але "
+"JVM не налаштована на їх отримання. Встановлено параметр «Без проксі»"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:58
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:64
+msgid "multiple"
+msgstr "декілька"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:500
+#, java-format
+msgid "Remove old keys from up to {0} object"
+msgid_plural "Remove old keys from up to {0} objects"
+msgstr[0] "Вилучити старі ключі з {0} об’єкту"
+msgstr[1] "Вилучити старі ключі з {0} об’єктів"
+msgstr[2] "Вилучити старі ключі з {0} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:184
+msgid "Delete the selection in the tag table"
+msgstr "Вилучити виділене з таблиці теґів"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagTable.java:276
+msgid "Add a new tag"
+msgstr "Додати новий теґ"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:340
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+"Зіпсована заготовка теґів ''{0}''-{1}'' — кількість елементів display_values "
+"повинна бути такою ж, як і у values"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:467
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
+msgid "More information about this feature"
+msgstr "Більш детальна інформація про цю функцію"
+
+#. space
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:490
+msgid "Optional Attributes:"
+msgstr "Необов'язкові атрибути:"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:581
+msgid "closedway"
+msgstr "замкнена лінія"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:586
+#, java-format
+msgid "Unknown type: {0}"
+msgstr "Невідомий тип: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
+#, java-format
+msgid "Could not read tagging preset source: {0}"
+msgstr "Неможливо прочитати з джерела заготовок теґів: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
+#, java-format
+msgid "Error parsing {0}: "
+msgstr "Помилка синтаксичного аналізу: {0} "
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
+#, java-format
+msgid "Elements of type {0} are supported."
+msgstr "Елементи типу {0} підтримуються."
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
+#: ../plugins/terracer/src/terracer/TerracerAction.java:149
+#, java-format
+msgid "Change {0} object"
+msgid_plural "Change {0} objects"
+msgstr[0] "Зміна об’єкта {0}"
+msgstr[1] "Зміна {0} об’єктів"
+msgstr[2] "Зміна {0} об’єктів"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
+msgid "Nothing selected!"
+msgstr "Нічого не вибрано!"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
+msgid "Selection unsuitable!"
+msgstr "Невдалий вибір!"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
+msgid "Apply Preset"
+msgstr "Застосувати заготовку"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
+msgid "Change Properties"
+msgstr "Змінити параметри"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
+#, java-format
+msgid "Preset group {1} / {0}"
+msgstr "Група заготовок {1} / {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
+#, java-format
+msgid "Preset group {0}"
+msgstr "Група заготовок {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
+msgid "Min. latitude"
+msgstr "Мін. широта"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
+msgid "Min. longitude"
+msgstr "Мін. довгота"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
+msgid "Max. latitude"
+msgstr "Макс. широта"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
+msgid "Max. longitude"
+msgstr "Макс. довгота"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
+msgid ""
+"URL from www.openstreetmap.org (you can paste a download URL here to specify "
+"a bounding box)"
+msgstr ""
+"URL з www.openstreetmap.org (ви можете вставити URL для завантаження з "
+"сервера вказавши тут межі габаритного прямокутника)"
+
+#: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
+msgid ""
+"The current value is not a valid OSM ID. Please enter an integer value > 0"
+msgstr ""
+"Поточне значення не є допустимим ідентифікатором OSM. Будь ласка, введіть "
+"ціле число > 0"
+
+#: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
+msgid "All Formats"
+msgstr "Всі формати"
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:41
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:96
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:60
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:32
+msgid "Contacting OSM Server..."
+msgstr "З'єднання з сервером OSM…"
+
+#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:47
+#, java-format
+msgid "Downloading points {0} to {1}..."
+msgstr "Завантаження точок {0} в {1}…"
+
+#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
+#: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
+#, java-format
+msgid ""
+"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
+"capabilities. Got ''{2}''"
+msgstr ""
+"Попередження: невірне значення атрибуту ''{0}'' елемента ''{1}'' в "
+"настройках можливостей сервера. Отримано ''{2}''"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:207
+#, java-format
+msgid "Failed to parse date ''{0}'' replied by server."
+msgstr "Сервер повідомив про невдалий розборі дати ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87
+#, java-format
+msgid ""
+"Unexpected format of error header for conflict in changeset update. Got "
+"''{0}''"
+msgstr ""
+"Неочікуваний формат заголовку помилки для конфлікту у оновлені набору "
+"правок. Отримано ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:127
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:129
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:133
+#, java-format
+msgid "Illegal longitude value for parameter ''{0}'', got {1}"
+msgstr "Невірне значення довготи для параметру ''{0}'', отримано {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131
+#, java-format
+msgid "Illegal latitude value for parameter ''{0}'', got {1}"
+msgstr "Невірне значення широти для параметру ''{0}'', отримано {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:299
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:301
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:308
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:314
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:319
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:325
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:330
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:341
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:348
+#, java-format
+msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
+msgstr "Неочікуване значення для ''{0}'' в URL запиті набору правок, маємо {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:366
+msgid ""
+"Cannot create a changeset query including both the query parameters ''uid'' "
+"and ''display_name''"
+msgstr ""
+"Неможливо створити запит набору правок, що включає обидва параметри ''uid'' "
+"та ''display_name''"
+
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:391
+#, java-format
+msgid "Unsupported parameter ''{0}'' in changeset query string"
+msgstr "Непідтримуваний параметр ''{0}'' в рядку запиту набору змін"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
+#, java-format
+msgid ""
+"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Несподіваний формат для номера порту в налаштуванні ''{0}''. Отримано "
+"''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:86
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:91
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:105
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:122
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:134
+msgid "The proxy will not be used."
+msgstr "Проксі не буде використовуватися."
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:90
+#, java-format
+msgid "Illegal port number in preference ''{0}''. Got {1}."
+msgstr "Неправильний номер порту в налаштуванні ''{0}''. Отримано {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:104
+#, java-format
+msgid "Warning: no preference ''{0}'' found."
+msgstr "Попередження: незнайдено налаштувань ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
+#, java-format
+msgid ""
+"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
+"use no proxy."
+msgstr ""
+"Попередження: знайдено неочікуване значення для налаштування ''{0}''. "
+"Отримано ''{1}''. Проксі використовуватись не буде."
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
+#, java-format
+msgid ""
+"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
+"''{1}''."
+msgstr ""
+"Попередження: неочікувані  параметри для HTTP-проксі. Отримано хост ''{0}'' "
+"та порт ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
+#, java-format
+msgid ""
+"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
+"''{1}''."
+msgstr ""
+"Попередження: неочікувані  параметри для SOCKS-проксі. Отримано хост ''{0}'' "
+"та порт ''{1}''."
+
+#. 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:144
+#, java-format
+msgid ""
+"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+msgstr "Помилка: підключення до ''{0}'' з URI ''{1}'' не вдалося. Помилка: {2}"
+
+#: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
+msgid ""
+"Warning: the JVM is not configured to lookup proxies from the system "
+"settings. The property ''java.net.useSystemProxies'' was missing at startup "
+"time.  Will not use a proxy."
+msgstr ""
+"Попередження: У системних настройках JVM вказано, не використовувати проксі. "
+"Параметр ''java.net.useSystemProxies'' був відсутній у момент запуску JOSM. "
+"Проксі не буде використовуватись."
+
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
+msgid "Parsing response from server..."
+msgstr "Розбір відповіді від сервера…"
+
+#: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:169
+#, java-format
+msgid "Unexpected XML element with name ''{0}''"
+msgstr "Неочікуваний елемент XML з іменем ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
+#, java-format
+msgid "Could not export ''{0}''."
+msgstr "Не можливо експортувати ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:40
+#, java-format
+msgid "Could not import ''{0}''."
+msgstr "Не можливо імпортувати ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:48
+msgid "Could not import files."
+msgstr "Не можливо імпортувати файли."
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:62
+#, java-format
+msgid "<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>"
+msgstr "<html>Не можливо  прочитати файл ''{0}''.<br>Помилка:<br>{1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:76
+#, java-format
+msgid "<html>Could not read files.<br>Error is:<br>{0}</html>"
+msgstr "<html>Не можливо  прочитати файли.<br>Помилка:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
+msgid ""
+"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
+"tracks."
+msgstr ""
+"Примітка: GPL не сумісна з ліцензією OSM. Не завантажуйте треки ліцензовані "
+"під GPL."
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:44
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:26
+msgid "GPX Files"
+msgstr "Файли GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:71
+msgid "GPS track description"
+msgstr "опис треку GPS"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:77
+msgid "Add author information"
+msgstr "Додати інформацію про автора"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:80
+msgid "Real name"
+msgstr "Справжнє ім'я"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:84
+msgid "E-Mail"
+msgstr "Ел. пошта"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:88
+msgid "Copyright (URL)"
+msgstr "Авторські права (URL)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:92
+msgid "Predefined"
+msgstr "Попередньо визначене"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:94
+msgid "Copyright year"
+msgstr "Авторські права (рік)"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:110
+msgid "Keywords"
+msgstr "Ключові слова"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:115
+msgid "Export options"
+msgstr "Опції експорту"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
+msgid "Export and Save"
+msgstr "Експортувати і зберегти"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:175
+#, java-format
+msgid ""
+"Error while exporting {0}:\n"
+"{1}"
+msgstr ""
+"Помилка при експортуванні {0}:\n"
+"{1}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:258
+msgid "Choose a predefined license"
+msgstr "Виберіть ліцензію з набору"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:134
+#, java-format
+msgid "Markers from {0}"
+msgstr "Мітки з {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:68
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
+#, java-format
+msgid ""
+"Error occured while parsing gpx file {0}. Only part of the file will be "
+"available"
+msgstr ""
+"Сталася помилка під час розбору файлу GPX {0}. Тільки частина файлу буде "
+"доступною"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:220
+#, java-format
+msgid "File \"{0}\" does not exist"
+msgstr "Файл \"{0}\" не існує"
+
+#. input was not properly parsed, abort
+#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:82
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:128
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:225
+#, java-format
+msgid "Parsing file \"{0}\" failed"
+msgstr "Невдалось розібрати файл ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
+msgid "Parse error: invalid document structure for GPX document."
+msgstr "Помилка розбору: неправильна структура документа GPX"
+
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
+#, java-format
+msgid "Unknown mode {0}."
+msgstr "Невідомий режим {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
+msgid "Image Files"
+msgstr "Файли зображень"
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
+msgid "folder"
+msgstr "каталог"
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
+msgid "Looking for image files"
+msgstr "Пошук файлів зображень"
+
+#: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
+msgid "No image files found."
+msgstr "Файли зображень не знайдені."
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
+#, java-format
+msgid "Failed to open input stream for resource ''{0}''"
+msgstr "Не вдалося відкрити вхідний потік ресурсів ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105
+#, java-format
+msgid ""
+"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
+"zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Попередження: не вдалося відкрити файл з розширенням ''{2}'' та ім’ям "
+"''{3}'' в файлі архіву zip ''{0}''. Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#, java-format
+msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
+msgstr ""
+"Елемент з ідентифікатором {0} відсутній у локальній базі даних. Не можу "
+"з’ясувати тип елемента."
+
+#: ../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:82
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:46
+#: ../core/src/org/openstreetmap/josm/io/ProgressInputStream.java:95
+msgid "Downloading OSM data..."
+msgstr "Завантаження OSM даних…"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:360
+#, java-format
+msgid "Fetching node with id {0} from ''{1}''"
+msgstr "Отримання точки з ід. {0} з ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:361
+#, java-format
+msgid "Fetching way with id {0} from ''{1}''"
+msgstr "Отримання лінії з ід. {0} з ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:362
+#, java-format
+msgid "Fetching relation with id {0} from ''{1}''"
+msgstr "Отримання зв’язку з ід. {0} з ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:368
+#, java-format
+msgid "Server replied with response code 404 for id {0}. Skipping."
+msgstr "Сервер повідомив про помилку з кодом 404 для ід. {0}. Пропускаємо."
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:410
+#, java-format
+msgid "Fetching a package of nodes from ''{0}''"
+msgstr "Отримання пакету точок з ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:411
+#, java-format
+msgid "Fetching a package of ways from ''{0}''"
+msgstr "Отримання пакету ліній з ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
+#, java-format
+msgid "Fetching a package of relations from ''{0}''"
+msgstr "Отримання пакету зв’язків з ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423
+msgid ""
+"Server replied with response code 404, retrying with an individual request "
+"for each primitive."
+msgstr ""
+"Сервер повідомив про помилку з кодом 404, повторити з індивідуальними "
+"запитами для кожного елемента."
+
+#: ../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] "Завантаження {0} об’єкту з ''{1}''"
+msgstr[1] "Завантаження {0} об’єктів з ''{1}''"
+msgstr[2] "Завантаження {0} об’єктів з ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:22
+msgid "NMEA-0183 Files"
+msgstr "Файли NMEA-0183"
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+msgid "Coordinates imported: "
+msgstr "Координати імпортовано: "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
+msgid "Malformed sentences: "
+msgstr "Спотворені висновки: "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:45
+msgid "Checksum errors: "
+msgstr "Невірна контрольна сума: "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:47
+msgid "Unknown sentences: "
+msgstr "Невідомі висновки: "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:49
+msgid "Zero coordinates: "
+msgstr "Нульові координати: "
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:54
+msgid "NMEA import success"
+msgstr "Імпорт NMEA успішно завершено"
+
+#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:57
+msgid "NMEA import failure!"
+msgstr "Збій при імпорті NMEA!"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:86
+#, java-format
+msgid "Preference ''{0}'' missing. Cannot initialize OsmApi."
+msgstr "Налаштування ''{0}'' відсутнє. Не можливо ініціалізувати OsmApi."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:165
+msgid "This version of JOSM is incompatible with the configured server."
+msgstr "Ця версія JOSM несумісна з налаштованим сервером."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166
+#, java-format
+msgid ""
+"It supports protocol version 0.6, while the server says it supports {0} to "
+"{1}."
+msgstr ""
+"Підтримується протокол версії 0.6, а сервер говорить, що підтримує версії "
+"{0} - {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:170
+#, java-format
+msgid "Communications with {0} established using protocol version {1}."
+msgstr "Зв’язок з {0} встановлено за допомогою протоколу версії {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:257
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
+#, java-format
+msgid "Unexpected format of ID replied by the server. Got ''{0}''."
+msgstr "Сервер повернув неочікуваний формат ідентифікатора. Отримано ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
+#, java-format
+msgid ""
+"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
+msgstr ""
+"Неочікуваний формат нової версії зміненого елемента ''{0}''. Отримано "
+"''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:312
+msgid "Creating changeset..."
+msgstr "Створення набору змін…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:322
+#, java-format
+msgid "Successfully opened changeset {0}"
+msgstr "Набір змін {0} успішно відкрито"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:346
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:386
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:662
+#, java-format
+msgid "Changeset ID > 0 expected. Got {0}."
+msgstr "Очікується ідентифікатор набору змін > 0. Отримано {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:348
+msgid "Updating changeset..."
+msgstr "Оновлення набору змін…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#, java-format
+msgid "Updating changeset {0}..."
+msgstr "Оновлення набору змін {0}…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:388
+msgid "Closing changeset..."
+msgstr "Закриття набору змін…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+msgid "No changeset present for diff upload."
+msgstr "Набори змін для надсилання відмінностей відсутні."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:416
+msgid "Preparing upload request..."
+msgstr "Підготовка запиту для надсилання…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
+msgid "Waiting 10 seconds ... "
+msgstr "Очікування 10 секунд… "
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
+#, java-format
+msgid "Starting retry {0} of {1} in {2} seconds ..."
+msgstr "Спроба {0} з {1} через {2} секунди…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:457
+msgid "OK - trying again."
+msgstr "Так — спробуємо ще раз."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:538
+#, java-format
+msgid "Starting retry {0} of {1}."
+msgstr "Спроба {0} з {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:634
+msgid "Current changeset is null. Cannot upload data."
+msgstr "Поточний набір змін порожній. Не вдається надіслати дані."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:636
+#, java-format
+msgid "ID of current changeset > 0 required. Current ID is {0}."
+msgstr ""
+"Треба, щоб ідентифікатор поточного набору змін був > 0. Поточний Ід.: {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:664
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}."
+msgstr ""
+"Очікується відкритий набір змін. Отримано закритий набір змін з "
+"ідентифікатором {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:92
+#, java-format
+msgid "(Code={0})"
+msgstr "(Код={0})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:94
+#, java-format
+msgid "The server replied an error with code {0}."
+msgstr "Сервер сповістив про помилку з кодом {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Exporter.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:18
+msgid "OSM Server Files bzip2 compressed"
+msgstr "Файли сервера OSM стиснуті за допомогою bzip2"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:30
+msgid "Invalid bz2 file."
+msgstr "Невірний bz2 файл."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:75
+msgid "Prolog of OsmChange document already written. Please write only once."
+msgstr ""
+"Prolog документа OsmChange вже написаний. Будь ласка, пишіть лише один раз."
+
+#: ../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 ""
+"Prolog документа OsmChange ще не написаний. Будь ласка, напишіть його "
+"спочатку."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:73
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:106
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:120
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:135
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:111
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:69
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:102
+#: ../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:144
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:143
+#, java-format
+msgid "Missing mandatory attribute ''{0}''."
+msgstr "Відсутній обов’язковий атрибут ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:79
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:95
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgstr ""
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу long. Отримано "
+"''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:98
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
+"''{1}''."
+msgstr ""
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу long (>=0). "
+"Отримано ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:112
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:108
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
+msgstr ""
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу double. Отримано "
+"''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:139
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:135
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgstr ""
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу boolean. Отримано "
+"''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:150
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:146
+msgid "<anonymous>"
+msgstr "<анонімний>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:202
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
+#, java-format
+msgid ""
+"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
+"''{1}''."
+msgstr ""
+"Неприпустиме значення обов’язкового атрибуту ''{0}'' типу OsmPrimitiveType. "
+"Отримано ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231
+#, java-format
+msgid ""
+"Warning: unsupported start element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Попередження: непідтримуваний початковий елемент ''{0}'' в наборі змін в "
+"позиції ({1},{2}). Пропускаємо."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
+msgid ""
+"Illegal document structure. Found node, way, or relation outside of "
+"''create'', ''modify'', or ''delete''."
+msgstr ""
+"Неприпустима структура документу. Знайдено node, way або relation за межами "
+"''create'', ''modify'' або ''delete''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
+#, java-format
+msgid ""
+"Warning: unsupported end element ''{0}'' in changeset content at position "
+"({1},{2}). Skipping."
+msgstr ""
+"Попередження: непідтримуваний кінцевий елемент ''{0}'' в наборі змін в "
+"позиції ({1},{2}). Пропускаємо."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
+msgid "Parsing changeset content ..."
+msgstr "Розбір вмісту набору змін…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:80
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:130
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:136
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:146
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:152
+#, java-format
+msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
+msgstr "Неприпустиме значення атрибуту ''{0}''. Отримано ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:83
+#, java-format
+msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
+msgstr "Неприпустиме числове значення атрибуту ''{0}''. Отримано ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:117
+#, java-format
+msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
+msgstr "Неприпустиме булівське значення атрибуту ''{0}''. Отримано ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:161
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:140
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:139
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
+msgstr "Відсутній обов’язковий атрибут ''{0}'' XML-елемента {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:147
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:146
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr "Непідтримувана версія: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:178
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr "Невизначений елемент  ''{0}'' знайдено у вхідному потоці. Скасовано."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:218
+msgid "Parsing list of changesets..."
+msgstr "Розбір списку наборів змін…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:126
+msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
+msgstr ""
+"Не вдалося підписати HTTP-з’єднання, використовуючи заголовок автентифікації "
+"OAuth"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:137
+#, java-format
+msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
+msgstr ""
+"Попередження: неочікуване значення для налаштування ''{0}''. Отримано "
+"''{1}''."
+
+#: ../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})"
+msgstr "(рядок {0}, стовпець {1})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:27
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:24
+msgid "OSM Server Files"
+msgstr "Файли серверу OSM"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:84
+#, java-format
+msgid "<html>An error occurred while saving.<br>Error is:<br>{0}</html>"
+msgstr "<html>Виникла помилка під час збереження.<br>Помилка: <br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
+#, java-format
+msgid ""
+"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Сталася помилка під час відновлення резервної копії файлу.<br>Помилка: "
+"<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:114
+#, java-format
+msgid "Could not back up file. Exception is: {0}"
+msgstr "Не можу створити резервний файл. Помилка: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
+#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:17
+msgid "OSM Server Files gzip compressed"
+msgstr "Файли сервера OSM стиснуті з допомогою gzip"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:238
+msgid "Parsing OSM history data ..."
+msgstr "Розбір даних історії OSM…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
+#, java-format
+msgid "File ''{0}'' does not exist."
+msgstr "Не існує файлу \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:170
+#, java-format
+msgid ""
+"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
+"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgstr ""
+"Відсутні обов’язкові атрибути елементу ''bounds''. Отримано minlon=''{0}'', "
+"minlat=''{1}'', maxlon=''{3}'', maxlat=''{4}'', origin=''{5}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:200
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:199
+msgid "Found XML element <nd> not as direct child of element <way>."
+msgstr "Знайдений XML-елемент <nd>, не є прямим нащадком елемента <way>."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:204
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
+msgstr "Відсутній обов’язковий атрибут ''{0}'' у <nd> лінії {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:211
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:210
+#, java-format
+msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
+msgstr "Невідповідне значення атрибуту ''ref'' елемента <nd>. Отримано {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:215
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:214
+#, java-format
+msgid "Deleted way {0} contains nodes"
+msgstr "Вилучена лінія {0} містить точки"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:234
+msgid "Found XML element <member> not as direct child of element <relation>."
+msgstr ""
+"Знайдено XML-елемент <member>, що не є прямим нащадком елементу <relation>."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:241
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:240
+#, java-format
+msgid "Missing attribute ''ref'' on member in relation {0}."
+msgstr "Відсутній атрибут ''ref'' у члена зв’язку {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:246
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:245
+#, java-format
+msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
+msgstr ""
+"Неприпустиме значення атрибуту ''ref'' у члена зв’язку {0}. Отримано {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:250
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:249
+#, java-format
+msgid "Missing attribute ''type'' on member {0} in relation {1}."
+msgstr "Відсутній атрибут ''type'' у члена {0} в зв’язку {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:255
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:254
+#, java-format
+msgid ""
+"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
+msgstr ""
+"Неприпустиме значення атрибуту ''type'' у члена {0} в зв’язку {1}. Отримано "
+"{2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:260
+msgid "Incomplete <member> specification with ref=0"
+msgstr "Неповна специфікація <member> з ref=0"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:265
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:264
+#, java-format
+msgid "Deleted relation {0} contains members"
+msgstr "Вилучений зв’язок {0} має підпорядкованих членів"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:276
+msgid "Missing key or value attribute in tag."
+msgstr "Відсутні ключ або значення теґу"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:277
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr "Невизначений елемент ''{0}'' знайдений у вхідному потоці. Пропущено."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:312
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:305
+msgid "Illegal object with ID=0."
+msgstr "Неприпустимий об’єкт з ід=0"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:338
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:342
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:331
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:335
+#, java-format
+msgid ""
+"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
+"{1}."
+msgstr ""
+"Неприпустиме значення для атрибуту ''version'' у елемента OSM з "
+"ідентифікатором {0}. Отримано {1}."
+
+#. default version in 0.5 files for existing primitives
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:349
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:352
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:337
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:342
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:345
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:359
+#, java-format
+msgid ""
+"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
+"API version is ''{3}''. Got {1}."
+msgstr ""
+"ПОПЕРЕДЖЕННЯ: Нормалізація значення атрибута ''version'' елемента  {0} на "
+"{2}, версія API — ''{3}''. Отримано {1}."
+
+#. should not happen. API version has been checked before
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:357
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:350
+#, java-format
+msgid "Unknown or unsupported API version. Got {0}."
+msgstr "Невідома чи непідтримувана версія API. Отримано {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:356
+#, java-format
+msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
+msgstr "Відсутній атрибут ''version'' у елемента OSM з ідентифікатором {0}."
+
+#. for a new primitive we just log a warning
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:395
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:405
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:388
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:398
+#, java-format
+msgid ""
+"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
+"Resetting to 0."
+msgstr ""
+"Неприпустиме значення атрибуту ''changeset'' у нового об’єкту {1}. Отримано "
+"{0}. Перевстановлено на  0."
+
+#. for an existing primitive this is a problem
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:399
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:409
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:392
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:402
+#, java-format
+msgid "Illegal value for attribute ''changeset''. Got {0}."
+msgstr "Неприпустиме значення для атрибуту ''changeset''. Отримано {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:411
+#, java-format
+msgid "Missing required attribute ''{0}''."
+msgstr "Відсутній обов’язковий атрибут ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:423
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:416
+#, java-format
+msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
+msgstr "Неприпустима довжина значення атрибуту ''{0}''. Отримано ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:444
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:437
+#, java-format
+msgid ""
+"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgstr ""
+"Лінія із зовнішнім ідентифікатором ''{0}'' містить відсутню точку з "
+"зовнішнім ідентифікатором ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:449
+#, java-format
+msgid "Deleted node {0} is part of way {1}"
+msgstr "Вилучена точка {0} є частиною лінії {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:464
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:457
+#, java-format
+msgid ""
+"Way {0} with {1} nodes has incomplete nodes because at least one node was "
+"missing in the loaded data."
+msgstr ""
+"Лінія {0} з {1} точками має неповні точки, тому що принаймні одна точка "
+"відсутня у завантажених даних."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:520
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:513
+#, java-format
+msgid ""
+"Relation with external id ''{0}'' refers to a missing primitive with "
+"external id ''{1}''."
+msgstr ""
+"Зв’язок із зовнішнім ідентифікатором ''{0}'' посилається на елемент з "
+"зовнішнім ідентифікатором ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:544
+#: ../plugins/reverter/src/reverter/MultiOsmReader.java:537
+#, java-format
+msgid "Deleted member {0} is used by relation {1}"
+msgstr "Вилучений член {0} входить до складу зв’язку {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:570
+msgid "Prepare OSM data..."
+msgstr "Підготовка OSM-даних…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:571
+msgid "Parsing OSM data..."
+msgstr "Розбір даних OSM…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:576
+msgid "Preparing data set..."
+msgstr "Підготовка даних…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:592
+#, java-format
+msgid "Line {0} column {1}: "
+msgstr "Лінія {0} стовпчик {1}: "
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:134
+msgid "Downloading from OSM Server..."
+msgstr "Завантаження з сервера OSM…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:142
+msgid "Downloading referring ways ..."
+msgstr "Завантаження залежних ліній…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:180
+msgid "Downloading referring relations ..."
+msgstr "Завантаження залежних зв’язків"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
+msgid "Reading changesets..."
+msgstr "Читання наборів змін…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
+msgid "Downloading changesets ..."
+msgstr "Завантаження наборів змін…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:94
+#, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Читання набору змін {0}…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:100
+#, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Завантаження набору змін {0}…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:130
+#, java-format
+msgid "Downloading {0} changeset ..."
+msgid_plural "Downloading {0} changesets ..."
+msgstr[0] "Завантаження {0} набору змін…"
+msgstr[1] "Завантаження {0} наборів змін…"
+msgstr[2] "Завантаження {0} наборів змін…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
+#, java-format
+msgid "({0}/{1}) Downloading changeset {2} ..."
+msgstr "({0}/{1}) Завантаження набору змін {2}…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
+#, java-format
+msgid "Downloading content for changeset {0} ..."
+msgstr "Завантаження вмісту набору змін {0}…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
+msgid "Downloading history..."
+msgstr "Завантаження історії…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:25
+msgid "Contacting Server..."
+msgstr "З'єднання з сервером…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:64
+#, java-format
+msgid "Failed to open connection to API {0}."
+msgstr "Не вдалося встановити підключення до API {0}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87
+msgid ""
+"Could not connect to the OSM server. Please check your internet connection."
+msgstr ""
+"Не вдається підключитися до сервера OSM. Будь ласка, перевірте підключення "
+"до Інтернету."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
+msgid "XML tag <user> is missing."
+msgstr "XML-теґ <user> — відсутній."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:43
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:67
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
+msgstr "Відсутній атрибут ''{0}'' XML-теґу ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:47
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
+msgstr ""
+"Неприпустиме значення атрибуту ''{0}'' у XML-теґа ''{1}''. Отримано {2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
+msgid "Reading user info ..."
+msgstr "Читання інформації про користувача…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
+msgid "Starting to upload with one request per primitive ..."
+msgstr ""
+"Початок надсилання даних на сервер окремими запитами по кожному елементу…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} залишилось. Надсилання точки ''{4}'' (ід: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} залишилось. Надсилання лінії ''{4}'' (ід: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#, java-format
+msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} залишилось. Надсилання зв’язку ''{4}'' (ід: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:122
+msgid "Starting to upload in one request ..."
+msgstr "Початок надсилання на сервер даних одним запитом…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
+#, java-format
+msgid "Value >0 expected for parameter ''{0}'', got {1}"
+msgstr "Очікувалось значення >0 для параметра ''{0}'', отримано {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:144
+msgid "Starting to upload in chunks..."
+msgstr "Початок надсилання даних порціями…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:160
+#, java-format
+msgid "({0}/{1}) Uploading {2} object..."
+msgid_plural "({0}/{1}) Uploading {2} objects..."
+msgstr[0] "({0}/{1}) надсилання {2} об’єкта…"
+msgstr[1] "({0}/{1}) надсилання {2} об’єктів…"
+msgstr[2] "({0}/{1}) надсилання {2} об’єктів…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:187
+msgid "Uploading data ..."
+msgstr "Надсилання даних…"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:218
+msgid "Unexpected id 0 for osm primitive found"
+msgstr "Знайдено неочікуваний ідентифікатор 0 для елемента OSM"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:102
+msgid "Skip download"
+msgstr "Пропустити завантаження"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:104
+msgid "Download Plugin"
+msgstr "Завантажити втулок"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:105
+msgid "Skip Download"
+msgstr "Пропустити завантаження"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:107
+#, java-format
+msgid "JOSM version {0} required for plugin {1}."
+msgstr "JOSM версії {0} потребує втулок {1}."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
+#, java-format
+msgid ""
+"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
+"Skipping download."
+msgstr ""
+"Попередження: Неможливо завантажити втулок ''{0}''. Невідоме посилання для "
+"його завантаження. Завантаження пропущене."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
+#, java-format
+msgid ""
+"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
+"valid URL. Skipping download."
+msgstr ""
+"Попередження: Неможливо завантажити втулок ''{0}''. Посилання для його "
+"завантаження ''{1}'' не є вірним. Завантаження пропущене."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:167
+#, java-format
+msgid "Failed to create plugin directory ''{0}''"
+msgstr "Не вдалося створити каталог втулка ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:175
+#, java-format
+msgid "Downloading Plugin {0}..."
+msgstr "Завантаження втулку {0}…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:18
+#: ../core/src/org/openstreetmap/josm/plugins/PluginException.java:30
+#, java-format
+msgid "An error occurred in plugin {0}"
+msgstr "У втулка {0} виникла помилка"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
+msgid "The following plugin is no longer necessary and has been deactivated:"
+msgid_plural ""
+"The following plugins are no longer necessary and have been deactivated:"
+msgstr[0] "Наступний втулок більше не потрібний і був відключений:"
+msgstr[1] "Наступні втулки більше не потрібні і були відключені:"
+msgstr[2] "Наступні втулки більше не потрібні і були відключені:"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
+#, java-format
+msgid ""
+"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
+"longer developed and very likely will produce errors.<br>It should be "
+"disabled.<br>Delete from preferences?</html>"
+msgstr ""
+"<html>Було запропоновано завантажити втулок \"{0}\".<br>Він більше не "
+"вдосконалюється і, можливо, буде працювати з помилками.<br>Краще його "
+"відключити.<br>Вилучити його з налаштувань?</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
+msgid ""
+"You updated your JOSM software.<br>To prevent problems the plugins should be "
+"updated as well.<br><br>Update plugins now?"
+msgstr ""
+"Ви оновили JOSM.<br>Щоб не було проблем, втулки теж варто "
+"оновити<br><br>Оновити втулки зараз?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
+#, java-format
+msgid "Last plugin update more than {0} days ago."
+msgstr "Останнє оновлення втулків відбувалось {0} днів тому."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
+msgid "Click to update the activated plugins"
+msgstr "Натисніть, щоб оновити активовані втулки"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
+msgid "Skip update"
+msgstr "Пропустити оновлення"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
+msgid "Click to skip updating the activated plugins"
+msgstr "Натисніть, щоб пропустити оновлення активованих втулків"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215
+msgid ""
+"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
+"disabled."
+msgstr ""
+"Пропуск оновлення втулків після оновлення JOSM. Автоматичне оновлення при "
+"старті відключене."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
+msgid ""
+"Skipping plugin update after elapsed update interval. Automatic update at "
+"startup is disabled."
+msgstr ""
+"Пропуск періодичного оновлення втулків JOSM. Автоматичне оновлення при "
+"старті відключене."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
+msgid ""
+"Running plugin update after JOSM upgrade. Automatic update at startup is "
+"enabled."
+msgstr ""
+"Запуск оновлення втулків після оновлення JOSM. Автоматичне оновлення при "
+"старті включене."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226
+msgid ""
+"Running plugin update after elapsed update interval. Automatic update at "
+"startup is disabled."
+msgstr ""
+"Запуск періодичного оновлення втулків JOSM. Автоматичне оновлення при старті "
+"включене."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
+#, java-format
+msgid ""
+"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
+msgstr ""
+"Неочікуване значення ''{0}'' для налаштування ''{1}''. Приймається значення "
+"''ask''."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
+#, java-format
+msgid ""
+"Plugin {0} requires a plugin which was not found. The missing plugin is:"
+msgid_plural ""
+"Plugin {0} requires {1} plugins which were not found. The missing plugins "
+"are:"
+msgstr[0] "Втулок {0} потребує втулок, який не знайдено. Відсутній втулок:"
+msgstr[1] "Втулок {0} потребує {1} втулки, які не знайдено. Відсутні втулки:"
+msgstr[2] "Втулок {0} потребує {1} втулків, які не знайдено. Відсутні втулки:"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
+#, java-format
+msgid ""
+"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
+"<br>You have to update JOSM in order to use this plugin.</html>"
+msgstr ""
+"<html>Втулок {0} вимагає JOSM версії {1}. Поточна версія JOSM — {2}.<br>Вам "
+"треба оновити JOSM, якщо ви бажаєте користуватись цим втулком.</html>"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:381
+#, java-format
+msgid "loading plugin ''{0}'' (version {1})"
+msgstr "завантаження втулка ''{0}'' (версія {1})"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
+#, java-format
+msgid ""
+"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
+"not found.<br>Delete from preferences?"
+msgstr ""
+"<html>Не вдалося завантажити втулок {0}, тому що основний клас<br>втулка "
+"''{1}'' не знайдено.<br>Вилучити його з налаштувань?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:395
+#, java-format
+msgid "Could not load plugin {0}. Delete from preferences?"
+msgstr "Не вдалося завантажити втулок {0}. Вилучити його з налаштувань?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:414
+msgid "Loading plugins ..."
+msgstr "Завантаження втулків…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:415
+msgid "Checking plugin preconditions..."
+msgstr "Перевірка попередніх умов втулків…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:442
+#, java-format
+msgid "Loading plugin ''{0}''..."
+msgstr "Завантаження втулка ''{0}''…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:523
+msgid "JOSM could not find information about the following plugin:"
+msgid_plural "JOSM could not find information about the following plugins:"
+msgstr[0] "JOSM не міг знайти інформацію про втулок:"
+msgstr[1] "JOSM не міг знайти інформацію про наступні втулки:"
+msgstr[2] "JOSM не міг знайти інформацію про наступні втулки:"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
+msgid "The plugin is not going to be loaded."
+msgid_plural "The plugins are not going to be loaded."
+msgstr[0] "Втулок не буде завантажений."
+msgstr[1] "Втулки не будуть завантажені."
+msgstr[2] "Втулки не будуть завантажені."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:557
+msgid "Determine plugins to load..."
+msgstr "Визначити втулки для завантаження…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:563
+msgid "Removing deprecated plugins..."
+msgstr "Видалення застарілих втулків…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:565
+msgid "Removing unmaintained plugins..."
+msgstr "Вилучення втулків без супроводу…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:589
+msgid "Updating the following plugin has failed:"
+msgid_plural "Updating the following plugins has failed:"
+msgstr[0] "Оновлення наступного втулка не вдалося:"
+msgstr[1] "Оновлення наступних втулків не вдалося:"
+msgstr[2] "Оновлення наступних втулків не вдалося:"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
+msgid ""
+"Please open the Preference Dialog after JOSM has started and try to update "
+"it manually."
+msgid_plural ""
+"Please open the Preference Dialog after JOSM has started and try to update "
+"them manually."
+msgstr[0] ""
+"Будь ласка, відкрийте діалог налаштувань після запуску JOSM та спробуйте "
+"оновити його вручну."
+msgstr[1] ""
+"Будь ласка, відкрийте діалог налаштувань після запуску JOSM та спробуйте "
+"оновити їх вручну."
+msgstr[2] ""
+"Будь ласка, відкрийте діалог налаштувань після запуску JOSM та спробуйте "
+"оновити їх вручну."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:608
+msgid "Plugin update failed"
+msgstr "Не вдалося оновити втулок"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:641
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:645
+msgid "Warning: failed to download plugin information list"
+msgstr "Попередження: не вдалося завантажити інформаційний список втулків"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:721
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:804
+msgid "Disable plugin"
+msgstr "Вимкнути втулок"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:708
+#, java-format
+msgid "Click to delete the plugin ''{0}''"
+msgstr "Натисніть, щоб вилучити втулок ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:712
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:810
+msgid "Keep plugin"
+msgstr "Залишити втулок"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:714
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
+#, java-format
+msgid "Click to keep the plugin ''{0}''"
+msgstr "Натисніть, щоб залишити втулок ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:788
+#, java-format
+msgid "Warning: failed to delete outdated plugin ''{0}''."
+msgstr "Попередження: не вдалося вилучити застарілий втулок ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:789
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
+#, java-format
+msgid ""
+"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
+"installation. JOSM is still going to load the old plugin version."
+msgstr ""
+"Попередження: не вдалося встановити вже завантажений втулок ''{0}''. Пропуск "
+"установки. JOSM все ще може завантажити стару версію втулка."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:794
+#, java-format
+msgid ""
+"Warning: failed to install plugin ''{0}'' from temporary download file "
+"''{1}''. Renaming failed."
+msgstr ""
+"Попередження: не вдалося встановити втулок ''{0}'' з тимчасово завантаженого "
+"файлу ''{1}''. Перейменування не вдалось."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:806
+#, java-format
+msgid "Click to disable the plugin ''{0}''"
+msgstr "Натисніть, щоб відключити втулок ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:819
+#, java-format
+msgid ""
+"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgstr "Виникла неочікувана помилка, яка викликана втулком ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:822
+#, java-format
+msgid "According to the information within the plugin, the author is {0}."
+msgstr "Відповідно до інформації з втулка, автором є {0}."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:825
+msgid ""
+"Try updating to the newest version of this plugin before reporting a bug."
+msgstr ""
+"Спробуйте оновити втулок до останньої версії, перш ніж повідомляти про "
+"помилку."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:827
+msgid "Should the plugin be disabled?"
+msgstr "Вимкнути втулок?"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:899
+msgid ""
+"The plugin has been removed from the configuration. Please restart JOSM to "
+"unload the plugin."
+msgstr ""
+"Втулок був вилучений з конфігурації. Будь ласка, перезавантажте JOSM "
+"вивантажити втулок."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:941
+msgid "Plugin information"
+msgstr "Інформація про втулок"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:946
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:223
+msgid "no description available"
+msgstr "немає опису"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:978
+msgid ""
+"Do not ask again and remember my decision (go to Preferences->Plugins to "
+"change it later)"
+msgstr ""
+"Більше не питати, і запам'ятати мій вибір (перейти до Налаштування-> Втулки, "
+"щоб змінити його пізніше)"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:81
+#, java-format
+msgid "The plugin file ''{0}'' does not include a Manifest."
+msgstr "Файл втулка ''{0}'' не містить Manifest."
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:225
+msgid "More info..."
+msgstr "Детальніше…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42
+#: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:44
+#, java-format
+msgid "Failed to create plugin information from manifest for plugin ''{0}''"
+msgstr "Не можливо створити інформацію про втулок з manifest’у втулка ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:46
+msgid "Reading local plugin information.."
+msgstr "Читання локальної інформації про втулок…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:80
+msgid "Processing plugin site cache files..."
+msgstr "Обробка інформації з кешу втулків…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:84
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:109
+#, java-format
+msgid "Processing file ''{0}''"
+msgstr "Обробка файлу ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:119
+#, java-format
+msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
+msgstr ""
+"Попередження: Не вдалося сканування файлу ''{0}'' для отримання інформації "
+"про втулок. Пропущено."
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:105
+msgid "Processing plugin files..."
+msgstr "Обробка файлів втулка…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:61
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:72
+msgid "Download plugin list..."
+msgstr "Завантажити список втулків…"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:133
+#, java-format
+msgid "Downloading plugin list from ''{0}''"
+msgstr "Завантаження списоку втулків з ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:185
+#, java-format
+msgid ""
+"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
+"from plugin site ''{1}''."
+msgstr ""
+"Попередження: не вдалося створити каталогу втулка ''{0}''. Неможливо "
+"записати у кеш список втулків з сайту ''{1}''."
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:189
+#, java-format
+msgid "Writing plugin list to local cache ''{0}''"
+msgstr "Запис списку втулків в локальний кеш ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:230
+#, java-format
+msgid "Parsing plugin list from site ''{0}''"
+msgstr "Розбір списку втулків з сайту ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:235
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:238
+#, java-format
+msgid ""
+"Failed to parse plugin list document from site ''{0}''. Skipping site. "
+"Exception was: {1}"
+msgstr ""
+"Не вдалося здійснити розбір документу зі списком втулків з сайту ''{0}''. "
+"Сайт пропущено. Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:248
+#, java-format
+msgid "Processing plugin list from site ''{0}''"
+msgstr "Обробка списку втулків з сайту ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301
+msgid "This is after the end of the recording"
+msgstr "Це відбувається після закінчення запису"
+
+#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:343
+msgid "Error playing sound"
+msgstr "Помилка відтворення звуку"
+
+#. Then ask for submitting a bug report, for exceptions thrown from a plugin too
+#.
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+msgid "Do nothing"
+msgstr "Нічого не робити"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:66
+msgid "Report Bug"
+msgstr "Повідомити про помилку"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
+msgid ""
+"An unexpected exception occurred.<br>This is always a coding error. If you "
+"are running the latest<br>version of JOSM, please consider being kind and "
+"file a bug report."
+msgstr ""
+"Виникла несподівана помилка.<br>Вона завжди є помилкою в програмуванні. Якщо "
+"ви запускаєте останню<br>версію JOSM, будь ласка, надішліть звіт про помилку."
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
+msgid "Unexpected Exception"
+msgstr "Непередбачена помилка"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
+msgid ""
+"You have encountered an error in JOSM. Before you file a bug report make "
+"sure you have updated to the latest version of JOSM here:"
+msgstr ""
+"Ви виявили помилку в JOSM. Перш ніж подати повідомлення про помилку, "
+"переконайтеся, що у вас здійснено оновлення до останньої версії JOSM тут:"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
+msgid ""
+"You should also update your plugins. If neither of those help please file a "
+"bug report in our bugtracker using this link:"
+msgstr ""
+"Ви повинні також оновити втулки. Якщо жодна з цих порад не допомогла, будь "
+"ласка, повідомте про помилку на баг-трекер, використовуючи це посилання:"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
+msgid ""
+"There the error information provided below should already be filled in for "
+"you. Please include information on how to reproduce the error and try to "
+"supply as much detail as possible."
+msgstr ""
+"Представлена нижче інформація про помилку вже підготовлена для вас. Будь "
+"ласка, додайте інформацію про те, як відтворити помилку і спробуйте описати "
+"це настільки детально, наскільки це можливо."
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
+msgid ""
+"Alternatively, if that does not work you can manually fill in the "
+"information below at this URL:"
+msgstr ""
+"Або ж, якщо це не спрацює ви можете вручну заповнити інформацію нижче за цим "
+"URL:"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:142
+msgid "(The text has already been copied to your clipboard.)"
+msgstr "(Текст вже скопійовано у буфер обміну)"
+
+#: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:157
+msgid "You have encountered a bug in JOSM"
+msgstr "Ви зіткнулися з помилкою в JOSM"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:42
+#, java-format
+msgid ""
+"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
+"the server URL in your preferences and your internet connection.</html>"
+msgstr ""
+"<html>Не вдалося ініціалізувати зв’язок з сервером OSM {0}.<br>Перевірте "
+"адресу сервера в налаштуваннях та підключення до Інтернету.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
+#, java-format
+msgid ""
+"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
+"OAuth to authenticate but currently there is no<br>OAuth Access Token "
+"configured.<br>Please open the Preferences Dialog and generate or enter an "
+"Access Token.</html>"
+msgstr ""
+"<html>Не вдалось автентифікувати сервер OSM ''{0}''.<br>Ви використовуєте "
+"автентифікацію OAuth, але зараз немає<br>налаштованої мітки доступу OAuth."
+"<br>Будь ласка, відкрийте діалог налаштувань та згенеруйте або введіть мітку "
+"доступу.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:78
+#, java-format
+msgid ""
+"<html><strong>Failed</strong> to delete <strong>relation {0}</strong>. It is "
+"still referred to by relation {1}.<br>Please load relation {1}, remove the "
+"reference to relation {0}, and upload again.</html>"
+msgstr ""
+"<html><strong>Не вдалось</strong> вилучити <strong>зв’язок {0}</strong>. Він "
+"все ще посилається на зв’язок {1}.<br>Будь ласка, завантажте зв’язок {1}, "
+"вилучіть посилання на зв’язок {0}, після чого знов наділіть дані на сервер.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
+#, java-format
+msgid ""
+"<html>Uploading to the server <strong>failed</strong> because your "
+"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
+"html>"
+msgstr ""
+"<html>Надсилання даних на сервер <strong>не вдалось</strong>, так як ваші "
+"дані<br> порушують обов’язкові умови.<br> Повідомлення про помилку:<br>{0}</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the username ''{0}'' failed."
+"<br>Please check the username and the password in the JOSM preferences.</"
+"html>"
+msgstr ""
+"<html>Автентифікація на сервері OSM користувача з ім’ям ''{0}'' не вдалась."
+"<br>Перевірте ім’я користувача та пароль в налаштуваннях JOSM. </html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
+#, java-format
+msgid ""
+"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+"<html>Автентифікація на сервері OSM користувача з міткою OAuth ''{0}'' не "
+"вдалась.<br>Будь ласка, запустіть діалог налаштувань та отримайте іншу мітку "
+"OAuth.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:133
+#, java-format
+msgid ""
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
+"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
+"html>"
+msgstr ""
+"<html>Авторизація на сервері OSM за допомогою мітки OAuth ''{0}'' не вдалась."
+"<br>Ця мітка не надає доступ до захищених ресурсів<br>''{1}''.<br>Будь "
+"ласка, запустіть діалог налаштувань та отримайте іншу мітку OAuth</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
+#, java-format
+msgid ""
+"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
+"later.</html>"
+msgstr ""
+"<html>Вийшов час очікування з’єднання з сервером OSM ''{0}''. Будь ласка, "
+"спробуйте пізніше.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
+msgid "no error message available"
+msgstr "повідомлення про помилку не доступне"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174
+#, java-format
+msgid ""
+"<html>Communication with the OSM server ''{0}''failed. The server "
+"replied<br>the following error code and the following error message:"
+"<br><strong>Error code:<strong> {1}<br><strong>Error message (untranslated)</"
+"strong>: {2}</html>"
+msgstr ""
+"<html>Збій з’єднання з сервером OSM ''{0}''. Відповідь сервера<br>містить "
+"наступний код та повідомлення про помилку:<br><strong>Код помилки:<strong> "
+"{1}<br><strong>Повідомлення про помилку (без перекладу):</strong> {2}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:212
+#, java-format
+msgid ""
+"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
+"already been closed.</html>"
+msgstr ""
+"<html>Закриття набору змін <strong>{0}</strong> не вдалося <br>тому що його "
+"вже закрито.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
+#, java-format
+msgid ""
+"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
+"already been closed on {1}.</html>"
+msgstr ""
+"<html>Закриття набору змін <strong>{0}</strong> не вдалося <br>тому що його "
+"вже закрито {1}.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:227
+#, java-format
+msgid ""
+"<html>The server reported that it has detected a conflict.<br>Error message "
+"(untranslated):<br>{0}</html>"
+msgstr ""
+"<html>Сервер повідомив, що він виявив конфлікт.<br>Повідомлення про помилку "
+"(без перекладу):<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:233
+msgid "<html>The server reported that it has detected a conflict.</html>"
+msgstr "<html>Сервер повідомив, що він виявив конфлікт.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
+#, java-format
+msgid ""
+"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
+"already been closed on {1}.</html>"
+msgstr ""
+"<html>Не вдалося надіслати набір змін <strong>{0}</strong><br>тому що його "
+"вже закрито {1}.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
+"security reasons. This is most likely because you are running<br>in an "
+"applet and because you did not load your applet from ''{1}''.</html>"
+msgstr ""
+"<html>Не вдалося встановити з’єднання з віддаленим сервером<br>''{0}''<br>з "
+"міркувань безпеки. Швидше за все, це тому, що ви запустили<br>аплет та тому "
+"що ви не завантажили цей аплет з ''{1}''.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:304
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
+"check your internet connection.</html>"
+msgstr ""
+"<html>Не вдалося встановити з’єднання з віддаленим сервером<br>''{0}''."
+"<br>Будь ласка, перевірте підключення до Інтернету.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
+#, java-format
+msgid ""
+"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
+"problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr ""
+"<html>Збій під час надсилання на або завантаження даних з <br>''{0}''<br>з-"
+"за проблем з передачею даних.<br>Подробиці (без перекладу): {1}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
+#, java-format
+msgid ""
+"<html>Failed to download data. Its format is either unsupported, ill-formed, "
+"and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
+msgstr ""
+"<html>Не вдалося завантажити дані. Їх формат або не підтримується, або вони "
+"пошкоджені чи несумісні.<br><br>Подробиці (без перекладу): {0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:352
+#, java-format
+msgid ""
+"<html>The OSM server<br>''{0}''<br>reported an internal server error."
+"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgstr ""
+"<html>Сервер OSM<br>''{0}''<br>повідомив про внутрішню помилку.<br>Швидше за "
+"все, це тимчасова проблема. Будь ласка, повторіть спробу пізніше.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:366
+#, java-format
+msgid "The OSM server ''{0}'' reported a bad request.<br>"
+msgstr "Сервер OSM ''{0}'' повідомив про невдалий запит.<br>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:371
+msgid ""
+"The area you tried to download is too big or your request was too large."
+"<br>Either request a smaller area or use an export file provided by the OSM "
+"community."
+msgstr ""
+"Ділянка, яку ви намагалися завантажити є занадто великою або ваш запит був "
+"надто великий.<br>Завантажте ділянку меншого розміру або скористайтесь "
+"файлами, які створюються OSM-спільнотою."
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:374
+#, java-format
+msgid "<br>Error message(untranslated): {0}"
+msgstr "<br>Повідомлення про помилку (без перекладу): {0}"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:388
+#, java-format
+msgid ""
+"The OSM server ''{0}'' does not know about an object<br>you tried to read, "
+"update, or delete. Either the respective object<br>does not exist on the "
+"server or you are using an invalid URL to access<br>it. Please carefully "
+"check the server''s address ''{0}'' for typos."
+msgstr ""
+"Серверу OSM ''{0}'' нічого не відомо про об’єкт<br>який ви намагаєтесь "
+"прочитати, оновити чи вилучити. Або такий об’єкт<br>відсутній на сервері, "
+"або ви використовуєте помилкове посилання для доступу<br>Будь ласка, уважно "
+"перевірте адресу сервера ''{0}'' на наявність помилок."
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:415
+#, java-format
+msgid ""
+"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
+"name ''{1}'' could not be resolved. <br>Please check the API URL in your "
+"preferences and your internet connection.</html>"
+msgstr ""
+"<html>Не вдалося встановити з’єднання з віддаленим сервером<br>''{0}''."
+"<br>Ім’я хосту ''{1}'' не знайдено. <br>Будь ласка, перевірте посилання до "
+"API в ваших налаштуваннях і підключення до Інтернету.</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
+#, java-format
+msgid ""
+"<html>The server reports that an object is deleted.<br><strong>Uploading "
+"failed</strong> if you tried to update or delete this object.<br> "
+"<strong>Downloading failed</strong> if you tried to download this object."
+"<br><br>The error message is:<br>{0}</html>"
+msgstr ""
+"<html>Сервер повідомляє, що об'єкт вилучено.<br><strong>Надсилання не "
+"вдалося</strong>, якщо ви намагались змінити або вилучити цей об'єкт.<br> "
+"<strong>Завантаження не вдалося</strong>, якщо ви намагались завантажити цей "
+"об’єкт.<br><br>Повідомлення про помилку:<br>{0}</html>"
+
+#: ../core/src/org/openstreetmap/josm/tools/I18n.java:354
+#, java-format
+msgid "Unable to find translation for the locale {0}. Reverting to {1}."
+msgstr "Не вдається знайти переклад мовою «{0}». Повертаємось до {1}."
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Попередження: не вдалося обробити zip-файл ''{0}''. Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
+#, java-format
+msgid ""
+"Warning: failed to access directory ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr ""
+"Попередження: не вдалося отримати доступ до каталогу ''{0}'' з міркувань "
+"безпеки. Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
+#, java-format
+msgid ""
+"Fatal: failed to locate image ''{0}''. This is a serious configuration "
+"problem. JOSM will stop working."
+msgstr ""
+"Серйозна помилка: не вдалося знайти зображення ''{0}''. Це є серйозною "
+"проблемою налаштувань. JOSM не буде працювати."
+
+#: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
+#, java-format
+msgid ""
+"Warning: failed to derive wiki language prefix from JOSM locale code "
+"''{0}''. Using default code ''en''."
+msgstr ""
+"Попередження: не вдалося отримати вікі префікс мови з локального коду JOSM "
+"''{0}''. Використовую типовий код — ''en''."
+
+#: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
+msgid ""
+"Failed to open URL. There is currently no platform set. Please set a "
+"platform first."
+msgstr ""
+"Не вдалося відкрити посилання. Зараз не задано платформу. Будь ласка, "
+"спочатку встановіть платформу."
+
+#. This list if far from complete!
+#. items with automatic shortcuts will not be added to the menu bar at all
+#. not really system, but to avoid odd results
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:49
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:50
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:51
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:52
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:53
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:54
+#: ../core/src/org/openstreetmap/josm/tools/PlatformHookWindows.java:55
+msgid "unused"
+msgstr "не використовується"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
+#, java-format
+msgid ""
+"Setting the keyboard shortcut ''{0}'' for the action ''{1}'' ({2}) failed\n"
+"because the shortcut is already taken by the action ''{3}'' ({4}).\n"
+"\n"
+msgstr ""
+"Встановлення скорочення клавіш \"{0}\" для дії \"{1}\" ({2}) не відбулося,\n"
+"тому що дане скорочення клавіш вже зайняте дією \"{3}\" ({4}).\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
+msgid ""
+"This action will have no shortcut.\n"
+"\n"
+msgstr ""
+"Ця дія не буде мати комбінації клавіш\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#, java-format
+msgid ""
+"Using the shortcut ''{0}'' instead.\n"
+"\n"
+msgstr ""
+"Натомість використовуйте  комбінацію клавіш \"{0}\"\n"
+"\n"
+
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
+msgid "(Hint: You can edit the shortcuts in the preferences.)"
+msgstr "(Підказка: Ви можете редагувати комбінації клавіш у вікні Опцій)"
+
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:75
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:87
+#, java-format
+msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
+msgstr "Попередження: не вдалося прочитати з MOTD ''{0}''. Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60
+#: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:80
+#, java-format
+msgid ""
+"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
+"was: {1}"
+msgstr ""
+"Попередження: не вдалося прочитати з MOTD ''{0}'' з міркувань безпеки. "
+"Помилка: {1}"
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
+#, java-format
+msgid ""
+"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
+"geometry from preferences."
+msgstr ""
+"Параметр з ключем ''{0}'' не містить ''{1}''. Не вдається відновити "
+"геометрію вікна з налаштувань."
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
+#, java-format
+msgid ""
+"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+"Параметр з ключем ''{0}'' не надає ціле (int) значення для ''{1}''. Отримано "
+"{2}. Не вдається відновити геометрію вікна з налаштувань."
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
+#, java-format
+msgid ""
+"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
+"{2}. Cannot restore window geometry from preferences."
+msgstr ""
+"Не вдалося розкласти поле ''{1}'' на складові в налаштуваннях з ключем "
+"''{0}''. Помилка: {2}. Не вдається відновити геометрію вікна з налаштувань."
+
+#: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
+#, java-format
+msgid ""
+"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
+"from preferences."
+msgstr ""
+"Параметра з ключем ''{0}'' не існує. Не вдається відновити геометрію вікна з "
+"налаштувань."
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
+msgid "Create grid of ways"
+msgstr "Створити сітку з ліній"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
+msgid ""
+"Forms a grid of ways in base to two existing that have various nodes and one "
+"in common"
+msgstr ""
+"Формувати сітку ліній, засновану на двох існуючих лініях, які мають різні "
+"точки і одну загальну точку"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:53
+msgid "Select two ways with a node in common"
+msgstr "Виберіть дві лінії, з загальною точкою"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:63
+msgid "Select two ways with alone a node in common"
+msgstr "Виберіть дві лінії з єдиною загальною точкою"
+
+#: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:104
+msgid "Create a grid of ways"
+msgstr "Створити сітку з ліній"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
+msgid "Private (only shared as anonymous, unordered points)"
+msgstr "Приватні (що видні іншим, як анонімні, невпорядковані точки)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60
+msgid "Public (shown in trace list and as anonymous, unordered points)"
+msgstr ""
+"Загальнодоступні (показуються в переліку треків анонімно, як невпорядковані "
+"точки)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61
+msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
+msgstr ""
+"Відстежуванні (доступні тільки як анонімні, впорядковані точки з часовими "
+"позначками)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62
+msgid ""
+"Identifiable (shown in trace list and as identifiable, ordered points with "
+"timestamps)"
+msgstr ""
+"Ідентифіковані  (показуються у переліку треків як ідентифіковані, "
+"впорядковані точки з часовими позначками)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
+msgid "Upload Trace"
+msgstr "Надсилання треку на сервер"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:117
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
+msgid "Upload Traces"
+msgstr "Надсилання треків на сервер"
+
+#. item "Ways/Path" combo "MTB Scale"
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:481
+msgid "Visibility"
+msgstr "Видимість"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
+msgid "Defines the visibility of your trace for other OSM users."
+msgstr "Визначає видимість вашого треку для інших користувачів OSM."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
+msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
+msgstr ""
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
+msgid "(What does that mean?)"
+msgstr "(Що це значить?)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
+msgid "Please enter Description about your trace."
+msgstr "Будь ласка, введіть опис вашого треку."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
+msgid "Tags (comma delimited)"
+msgstr "Теґи (через кому)"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
+msgid "Please enter tags about your trace."
+msgstr "Введіть теґи, що описують ваш трек."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:193
+#, java-format
+msgid "Selected track: {0}"
+msgstr "Виділений трек: {0}"
+
+#. Set progress dialog to indeterminate while connecting
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:216
+msgid "Connecting..."
+msgstr "З'єднуюсь..."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239
+msgid "Upload cancelled"
+msgstr "Надсилання скасовано"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249
+msgid "Error while uploading"
+msgstr "Помилка під час надсилання даних на сервер"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:303
+msgid "GPX upload was successful"
+msgstr "Завантаження GPX  було успішним"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:304
+msgid "Upload failed. Server returned the following message: "
+msgstr "Збій при надсиланні. Сервер відповів наступним повідомленням: "
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:346
+#, java-format
+msgid "Uploading GPX track: {0}% ({1} of {2})"
+msgstr "Надсилання GPX-трека на сервер: {0}% ({1} з {2})"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:378
+msgid "No description provided. Please provide some description."
+msgstr "Опис відсутній. Додайте деякий опис."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:381
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:403
+msgid "No GPX layer selected. Cannot upload a trace."
+msgstr "Шар GPX не вибрано. Не вдається надіслати трек на сервер."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:384
+msgid "No username provided."
+msgstr "Немає імені користувача."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:387
+msgid "No password provided."
+msgstr "Немає пароля."
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
+msgid "Uploading GPX Track"
+msgstr "Надсилання GPX-треку на сервер"
+
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:36
+msgid "Uploads traces to openstreetmap.org"
+msgstr "Надсилання треків на сайт openstreetmap.org"
+
+#. item "Man-Made/Buildings/Addresses" text "Country code"
+#. </optional>
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+#: ../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
+msgid "Address Interpolation"
+msgstr "Вставка адрес"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:25
+msgid "Handy Address Interpolation Functions"
+msgstr "Функція ручної вставки адрес"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:34
+msgid "Define Address Interpolation"
+msgstr "Визначити правила вставки адрес"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Odd"
+msgstr "Непарні"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Even"
+msgstr "Парні"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Alphabetic"
+msgstr "За алфавітом"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
+msgid "Numeric"
+msgstr "Числовий"
+
+#. 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
+msgid "Actual"
+msgstr "Поточне"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+msgid "Estimate"
+msgstr "Приблизне"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:113
+msgid "Potential"
+msgstr "Потенційне"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:190
+#, java-format
+msgid "Relation: {0}"
+msgstr "Зв’язок: {0}"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:202
+msgid "Associate with street using:"
+msgstr "Зв'язати з вулицею, використовуючи:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:213
+msgid "Numbering Scheme:"
+msgstr "Схема нумерації:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:216
+msgid "Increment:"
+msgstr "Приріст:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:220
+msgid "Starting #:"
+msgstr "Починаючи з №:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:221
+msgid "Ending #:"
+msgstr "Закінчуючи №:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:226
+msgid "Accuracy:"
+msgstr "Точність:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:238
+msgid "Convert way to individual house numbers."
+msgstr "Перетворити лінію у індивідуальні номери будинків"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:307
+#, java-format
+msgid "Will associate {0} additional house number nodes"
+msgstr "Буде асоційовано {0} додаткових точок номерів будинків"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:454
+msgid "City:"
+msgstr "Місто:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:455
+msgid "State:"
+msgstr "Регіон:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:456
+msgid "Post Code:"
+msgstr "Поштовий індекс:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:457
+msgid "Country:"
+msgstr "Країна:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:458
+msgid "Full Address:"
+msgstr "Повна адреса:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:493
+msgid "Optional Information:"
+msgstr "Додатково інформація:"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:678
+msgid "Please select a street to associate with address interpolation way"
+msgstr ""
+"Будь ласка, виберіть вулицю, щоб зв'язати її з лінією встановлення з адрес"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:691
+msgid "Please select address interpolation way for this street"
+msgstr "Будь ласка, виберіть лінію встановлення адрес для цієї вулиці"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1078
+msgid "Expected odd numbers for addresses"
+msgstr "Очікуються непарні номери будівель"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1083
+msgid "Expected even numbers for addresses"
+msgstr "Очікуються непарні номери будівель"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1093
+msgid "Expected valid number for address increment"
+msgstr "Очікується вірне значення для збільшення номерів будівель"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
+msgid "Country code must be 2 letters"
+msgstr "Код країни повинен складатись з 2 символів"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1278
+msgid "Please enter valid number for starting and ending address"
+msgstr "Будь ласка, введіть вірний номер для початку та закінчення нумерації"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1296
+msgid "Alphabetic address must end with a letter"
+msgstr "Алфавітна адреса має закінчуватися літерою"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1311
+msgid "Starting and ending numbers must be the same for alphabetic addresses"
+msgstr ""
+"Початковий та кінцевий номери повинні буди однаковими для алфавітних адрес"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1317
+msgid "Starting address letter must be less than ending address letter"
+msgstr ""
+"Літера початкової адреси повинна бути ближчою до початку алфавіту ніж літера "
+"кінцевої адреси"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1333
+msgid "Please enter valid number for starting address"
+msgstr "Будь ласка, введіть вірний номер для початкової адреси"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1336
+msgid "Please enter valid number for ending address"
+msgstr "Будь ласка, введіть вірний номер для кінцевої адреси"
+
+#: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1343
+msgid "Starting address number must be less than ending address number"
+msgstr "Номер початкової адреси повинен буди меншим за номер кінцевої адреси"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:36
+msgid "Building address"
+msgstr "Адреса будівлі"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:43
+msgid "House number:"
+msgstr "Номер дома:"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:44
+msgid "Street Name:"
+msgstr "Вулиця:"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:48
+msgid "Increment"
+msgstr "Збільшення"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:49
+msgid "Decrement"
+msgstr "Зменшення"
+
+#: ../plugins/buildings_tools/src/buildings_tools/AddressDialog.java:51
+msgid "Numbers:"
+msgstr "Номери:"
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
+msgid "Cannot place building outside of the world."
+msgstr "Не можливо розмістити будівлі за межами світу."
+
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
+msgid "Create building"
+msgstr "Створити будівлю"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
+msgid "Set buildings size"
+msgstr "Встановити розмір будівель"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:24
+msgid "Use Address dialog"
+msgstr "Використовувати діалог адрес"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:38
+msgid "Buildings width:"
+msgstr "Ширина будинків:"
+
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:39
+msgid "Length step:"
+msgstr "Довжина кроку:"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
+msgid "Draw buildings"
+msgstr "Креслити будівлі"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
+msgid "Point on angle of building to start drawing"
+msgstr "Вкажіть кут будівлі, щоб почати креслення"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
+msgid "Point on opposite end of building"
+msgstr "Вкажіть протилежний кінець будівлі"
+
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
+msgid "Set width of building"
+msgstr "Встановити ширину будівлі"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
+msgid "Grab buildings"
+msgstr "Захопити будівлі"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
+msgid "Extract building on click (vector images only)"
+msgstr "Видобути будівлю, клацнувши мишею (тільки векторне зображення)"
+
+#. group "Man-Made"
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
+msgid "Buildings"
+msgstr "Будівлі"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
+msgid ""
+"This feature requires (at least) one special cadastre\n"
+"Buildings layer and an OSM data layer."
+msgstr ""
+"Ця функція вимагає (принаймні) один спеціальний шар\n"
+"Будинки з кадастру та шар даних OSM."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:102
+#, java-format
+msgid ""
+"Location \"{0}\" found in cache.\n"
+"Load cache first ?\n"
+"(No = new cache)"
+msgstr ""
+"Положення \"{0}\" знайдене в кеші.\n"
+"Спочатку завантажити кеш?\n"
+"(Ні = новий кеш)"
+
+#. this below is a temporary workaround to fix the "always on top" issue
+#. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
+#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:418
+msgid "Select Feuille"
+msgstr "Виберіть шар"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:157
+msgid ""
+"Error loading file.\n"
+"Probably an old version of the cache file."
+msgstr ""
+"Помилка завантаження файлу.\n"
+"Можливо в кеші стара версія файлу."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:17
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:18
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert4ZoneFilter.java:20
+#, java-format
+msgid "Lambert Zone {0} cache file (.{0})"
+msgstr "Зона Lambert {0} файл кешу (.{0})"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:19
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:20
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:21
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:22
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:23
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:24
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:26
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileLambert9ZoneFilter.java:27
+#, java-format
+msgid "Lambert CC9 Zone {0} cache file (.CC{0})"
+msgstr "Зона Lambert CC9 {0} файл кешу (.CC{0})"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:19
+msgid "Guadeloupe Fort-Marigot cache file (.UTM1)"
+msgstr "Файл кешу Guadeloupe Fort-Marigot (.UTM1)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:20
+msgid "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgstr "Файл кешу Guadeloupe Ste-Anne (.UTM2)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:21
+msgid "Martinique Fort Desaix cache file (.UTM3)"
+msgstr "Файл кешу Martinique Fort Desaix (.UTM3)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
+msgid "Reunion RGR92 cache file (.UTM4)"
+msgstr "Файл кешу Reunion RGR92 (.UTM4)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:51
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:62
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:216
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:171
+msgid "CadastreGrabber: Illegal url."
+msgstr "CadastreGrabber: Не дійсне посилання."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:81
+msgid ""
+"Cannot open a new client session.\n"
+"Server in maintenance or temporary overloaded."
+msgstr ""
+"Не вдається відкрити нову сесію клієнту.\n"
+"Сервер на обслуговуванні або тимчасового перевантажений."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:89
+#, java-format
+msgid ""
+"Town/city {0} not found or not available\n"
+"or action canceled"
+msgstr ""
+"Місто {0} не знайдено або не доступне\n"
+"або дію відмінено"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
+msgid "Choose from..."
+msgstr "Виберіть з…"
+
+#. pane.createDialog(Main.parent, tr("Select commune")).setVisible(true);
+#. this below is a temporary workaround to fix the "always on top" issue
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:397
+msgid "Select commune"
+msgstr "Виберіть загальне"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:176
+msgid "Cadastre"
+msgstr "Кадастр"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:185
+msgid "Auto sourcing"
+msgstr "Автоматичні джерела"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:251
+msgid ""
+"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
+"which is currently allocated for full-screen switch by default\n"
+"Would you like to restore F11 for grab action ?"
+msgstr ""
+"Втулок cadastre-fr використовує  для захоплення клавішу F11,\n"
+"яка зазвичай включає повноекранний режим.\n"
+"Ви бажаєте назначити на клавішу F11 функцію захопленя?"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:254
+msgid "Restore grab shortcut F11"
+msgstr "Відновити  дію захоплення клавішею F11"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:259
+msgid "JOSM is stopped for the change to take effect."
+msgstr "JOSM зупиняється, щоб зміни вступили в силу."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:366
+#, java-format
+msgid ""
+"Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgstr ""
+"Попередження: не вдалося ввімкнути параметр «завжди зверху» для діалогу "
+"додаткових параметрів . Помилка: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
+msgid "Replace original background by JOSM background color."
+msgstr "Замінити тло оригіналу кольором тла JOSM"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:33
+msgid "Reverse grey colors (for black backgrounds)."
+msgstr "Обернути сірий кольор (на чорному тлі)."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:35
+msgid "Set background transparent."
+msgstr "Встановити прозоре тло."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:37
+msgid "Draw boundaries of downloaded data."
+msgstr "Показувати межі завантажених даних."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:41
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:286
+msgid "Disable image cropping during georeferencing."
+msgstr "Відключити обрізку зображень під час гео-прив'язування"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
+msgid "Select first WMS layer in list."
+msgstr "Виберіть перший шар WMS зі списку"
+
+#. item "Man Made/Pipeline" combo "Type"
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--waterway tags -->
+#.
+#. <rule>
+#. <condition k="waterway" v="river"/>
+#. color riverbank
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="canal"/>
+#. color stream
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="ditch"/>
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="waterway" v="drain"/>
+#. color marsh
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="water"/>
+#. <icon src="nautical/water.png"/>
+#. color water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="coastline"/>
+#. <icon src="misc/no_icon.png"/>
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2348 build/trans_style.java:993
+#: build/trans_style.java:1010 build/trans_style.java:1026
+#: build/trans_style.java:1033 build/trans_style.java:3492
+#: build/trans_style.java:3500
+msgid "water"
+msgstr "вода"
+
+#. color tiger_data
+#. </rule>
+#.
+#. <!-- lot's of "openGeoDB:..." tags can be found in germany -->
+#. <rule>
+#. <condition k="openGeoDB:type" v="Stadt"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Kreis"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Gemeinde"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="Ort"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:type" v="District"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="openGeoDB:location" v="locality"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--annotation tags -->
+#.
+#. <!--"work in progress" tags -->
+#.
+#. <rule>
+#. <condition k="building"/>
+#. <icon annotate="true" src="misc/landmark/building.png" priority="-10000"/>
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:68
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:101
+#: build/trans_style.java:4292
+msgid "building"
+msgstr "будівля"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:69
+msgid "symbol"
+msgstr "символ"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:70
+msgid "parcel"
+msgstr "ділянка"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:71
+msgid "parcel number"
+msgstr "номер ділянки"
+
+#. color area
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:housenumber"/>
+#. <icon annotate="true" src="misc/housenumber.png" priority="-50000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:postcode"/>
+#. <icon annotate="true" src="misc/housenumber.png" priority="-50000"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="odd"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="even"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="all"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="addr:interpolation" v="alphabetic"/>
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
+#: build/trans_style.java:4320 build/trans_style.java:4327
+#: build/trans_style.java:4334 build/trans_style.java:4341
+msgid "address"
+msgstr "адреса"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:73
+msgid "locality"
+msgstr "місце знаходження"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:74
+msgid "section"
+msgstr "розділ"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:75
+msgid "commune"
+msgstr "община"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:80
+msgid "Enable automatic caching."
+msgstr "Увімкнути автоматичне кешування."
+
+#. disabled by default
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
+msgid "Max. cache size (in MB)"
+msgstr "Макс. розмір кешу (МБ)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
+msgid ""
+"A special handler of the French cadastre wms at www.cadastre.gouv."
+"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
+"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
+"by this plugin."
+msgstr ""
+"Спеціальний обробник WMS-шару французького кадастру з www.cadastre.gouv.fr "
+"<BR> <BR> Будь ласка, прочитайте умови використання тут (французською): <br> "
+"<A HREF = \"http://www. cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html \"> http://www.cadastre.gouv.fr/scpc/html/"
+"CU_01_ConditionsGenerales_fr.html </A> <BR> до надсилання на сервер будь-"
+"яких даних, створених за допомогою цього втулка."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:98
+msgid "French cadastre WMS"
+msgstr "WMS французького кадастру"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:105
+msgid "<html>Value of key \"source\" when autosourcing is enabled</html>"
+msgstr ""
+"<html>Значення теґу \"source\", коли включені автоматичні джерела</html>"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:106
+msgid "Source"
+msgstr "Джерело"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317
+msgid ""
+"Replace the original white background by the backgound color defined in JOSM "
+"preferences."
+msgstr ""
+"Замінити оригінальний білий фон на колір фону, заданий у налаштуваннях JOSM."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117
+msgid ""
+"Invert the original black and white colors (and all intermediate greys). "
+"Useful for texts on dark backgrounds."
+msgstr ""
+"Інвертувати чорний та білий кольори оригіналу (а також напівтони сірого). "
+"Корисно для текстів на темному тлі."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127
+msgid "Allows multiple layers stacking"
+msgstr "Дозволити нашарування кількох шарів"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132
+msgid "Set WMS layers transparency. Right is opaque, left is transparent."
+msgstr ""
+"Встановити прозорість шарів WMS. Праворуч — непрозорий, ліворуч — прозорий."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
+msgid "Draw a rectangle around downloaded data from WMS server."
+msgstr "Показувати прямокутник навколо даних, завантажених з сервера WMS."
+
+#. option to select the single grabbed image resolution
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:147
+msgid "Image resolution:"
+msgstr "Роздільна здатність зображення:"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:157
+msgid "High resolution (1000x800)"
+msgstr "Висока роздільна здатність (1000x800)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:159
+msgid "Medium resolution (800x600)"
+msgstr "Середня роздільна здатність (800x600)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:161
+msgid "Low resolution (600x400)"
+msgstr "Низька роздільна здатність (600x400)"
+
+#. option to select image zooming interpolation method
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:177
+msgid "Image filter interpolation:"
+msgstr "Фільтр інтерполяції зображень:"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:179
+msgid "Nearest-Neighbor (fastest) [ Default ]"
+msgstr "Найближчий-Сусід (дуже швидко) [типово]"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:180
+msgid "Bilinear (fast)"
+msgstr "Білінійна (швидко)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:181
+msgid "Bicubic (slow)"
+msgstr "Бікубічна (повільно)"
+
+#. the vectorized images multiplier
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:195
+msgid "Vector images grab multiplier:"
+msgstr "Коефіцієнт захвату векторних зображень:"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:207
+msgid "Grab one image full screen"
+msgstr "Захопити весь екран в одне зображення"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:211
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:215
+msgid "Grab smaller images (higher quality but use more memory)"
+msgstr ""
+"Захоплювати у малі зображення (висока якість, але використовує більше "
+"пам’яті)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:219
+msgid "Fixed size square (default is 100m)"
+msgstr "Фіксований розмір площі (типово 100 м)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:239
+msgid "Fixed size (from 25 to 1000 meters)"
+msgstr "Фіксований розмір (від 25 до 1000 метрів)"
+
+#. WMS layers selection
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:244
+msgid "Layers:"
+msgstr "Шари:"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:247
+msgid "See, rivers, swimming pools."
+msgstr "Моря, ріки, басейни"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:250
+msgid "Buildings, covers, underground constructions."
+msgstr "Будівлі, сховища, підземні споруди."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:253
+msgid "Symbols like cristian cross."
+msgstr "Символ, наприклад християнський хрест"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:256
+msgid "Parcels."
+msgstr "Ділянки."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:259
+msgid "Parcels numbers, street names."
+msgstr "Номера ділянок, назви вулиць."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:262
+msgid "Address, houses numbers."
+msgstr "Адреси, номери будівель"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:265
+msgid "Locality, hamlet, place."
+msgstr "Населений пункт, хутір, селище."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:268
+msgid "Cadastral sections and subsections."
+msgstr "Розділи і підрозділи кадастру."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:271
+msgid "Municipality administrative borders."
+msgstr "Муніципальні адміністративні кордони."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:279
+msgid "Raster images grab multiplier:"
+msgstr "Коефіцієнт захвату растрових зображень:"
+
+#. the crosspiece display
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:289
+msgid "Display crosspieces:"
+msgstr "Показати перемички:"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:323
+msgid "Oldest files are automatically deleted when this size is exceeded"
+msgstr ""
+"Найстаріші файли автоматично вилучаються у разі, якщо цей розмір буде "
+"перевищено"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329
+msgid ""
+"Automatically selects the first WMS layer if multiple layers exist when "
+"grabbing."
+msgstr ""
+"Автоматично вибирати перший шар WMS під час захоплення, якщо існує кілька "
+"шарів."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:81
+#: ../plugins/cadastre-fr/src/cadastre_fr/CheckSourceUploadHook.java:88
+msgid "Add \"source=...\" to elements?"
+msgstr "Додати до елементів \"source=…\"?"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:48
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:51
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:28
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:23
+#, java-format
+msgid "Downloading {0}"
+msgstr "Завантажується {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:56
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:59
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSVectorImage.java:32
+msgid "Contacting WMS Server..."
+msgstr "З'єднання з сервером WMS…"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:166
+msgid "Create buildings"
+msgstr "Створити будівлі"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:271
+msgid ""
+"To avoid cadastre WMS overload,\n"
+"building import size is limited to 1 km2 max."
+msgstr ""
+"Щоб запобігти надлишкового навантаження на WMS-шар кадастру,\n"
+"розмір імпортованих будівель обмежений до 1 кв.км."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:276
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:221
+msgid "Please, enable auto-sourcing and check cadastre millesime."
+msgstr "Будь ласка, включіть авто-джерела та перевірте марочний кадастр"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:66
+msgid "Extract SVG ViewBox..."
+msgstr "Витягти SVG ViewBox…"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:70
+msgid "Extract best fitting boundary..."
+msgstr "Витягти краще розташування кордону…"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGTask.java:134
+msgid "Create boundary"
+msgstr "Створити кордон"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:33
+msgid "Contacting cadastre WMS ..."
+msgstr "Зв'язуюся з кадастровим WMS…"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:40
+msgid "Image already loaded"
+msgstr "Зображення вже завантажено"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:76
+msgid ""
+"Municipality vectorized !\n"
+"Use the normal Cadastre Grab menu."
+msgstr ""
+"Територію векторизовано!\n"
+"Використовуйте звичайне меню Отримати з кадастру"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:21
+msgid "Extract commune boundary"
+msgstr "Витягти кордони общини"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
+msgid "Only on vectorized layers"
+msgstr "Тільки на векторизованних шарах"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:20
+msgid "Grab building layer only"
+msgstr "Шар тільки для захоплення будівель"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBuildings.java:31
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:38
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:93
+msgid ""
+"To enable the cadastre WMS plugin, change\n"
+"the current projection to one of the cadastre\n"
+"projections and retry"
+msgstr ""
+"Щоб включити кадастровий втулок WMS, змініть\n"
+"поточну проекцію на проекцію кадастру\n"
+"та спробуйте ще раз"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:25
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+msgid "Download Image from French Cadastre WMS"
+msgstr "Завантажити зображення з WMS Кадастру Франції"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java:26
+#, java-format
+msgid "Cadastre: {0}"
+msgstr "Кадастр: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:55
+msgid "Grab non-georeferenced image"
+msgstr "Захопити не прив'язане до координат зображення"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:76
+msgid "Georeferencing interrupted"
+msgstr "Прив'язку перервано"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:107
+msgid ""
+"This image contains georeference data.\n"
+"Do you want to use them ?"
+msgstr ""
+"Це зображення містить дані з координатами.\n"
+"Ви бажаєте їх використовувати?"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:179
+msgid ""
+"Click first corner for image cropping\n"
+"(two points required)"
+msgstr ""
+"Позначте перший кут для обрізки зображення\n"
+"(Потрібно позначити дві точки)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:180
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:199
+msgid "Image cropping"
+msgstr "Кадрування"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:198
+msgid "Click second corner for image cropping"
+msgstr "Позначте другий кут для обрізки зображення"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:218
+msgid ""
+"Click first Lambert crosspiece for georeferencing\n"
+"(two points required)"
+msgstr ""
+"Клацніть на першу Lambert-перемичку для геоприв’язки\n"
+"(Потрібно позначити дві точки)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:219
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:238
+msgid "Image georeferencing"
+msgstr "Геоприв’язування зображень"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:237
+msgid "Click second Lambert crosspiece for georeferencing"
+msgstr "Клацніть на другу Lambert-перемичку для геоприв’язки"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:268
+msgid ""
+"Do you want to cancel completely\n"
+"or just retry "
+msgstr ""
+"Ви хочете повністю скасувати\n"
+"чи лише повторити спробу "
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:285
+msgid "Enter cadastre east,north position"
+msgstr "Введіть положення сходу та півночі кадастру"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:287
+msgid "(Warning: verify north with arrow !!)"
+msgstr "(Попередження: перевірте північ за допомогою стрілки!!)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:289
+msgid "East"
+msgstr "Схід"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:290
+msgid "North"
+msgstr "Північ"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:301
+msgid "I use the mouse"
+msgstr "Я користуюсь мишею"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:311
+#, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Встановити {0} Lambert-координати"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:24
+msgid "Load location from cache (only if cache is enabled)"
+msgstr "Завантажити розташування із кешу (якщо він включений)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
+#, java-format
+msgid "{0} not allowed with the current projection"
+msgstr "{0} не допускається в поточний проекції"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
+#, java-format
+msgid ""
+"Cannot load cache {0} which is not compatible with current projection zone"
+msgstr ""
+"Неможливо завантажити кеш {0}, який не сумісний з поточною зоною проекції"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
+#, java-format
+msgid ""
+"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgstr "Обраний файл {0} не є кеш-файлом цього втулка (невірне розширення)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
+#, java-format
+msgid "The location {0} is already on screen. Cache not loaded."
+msgstr "Місце положення {0} вже не екрані. Кеш не завантажено."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
+msgid "(optional)"
+msgstr "(опціонально)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
+msgid "Change location"
+msgstr "Змінити місце положення"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
+msgid "Set a new location for the next request"
+msgstr "Встановити нове місце положення для наступного запиту"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:68
+msgid "Add a new municipality layer"
+msgstr "Додати новий шар муніципалітету"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:70
+msgid "Commune"
+msgstr "Община"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:72
+msgid ""
+"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
+"known by www.cadastre.gouv.fr .</html>"
+msgstr ""
+"<html> Введіть назву села, селища чи міста.<br>Використовуйте синтаксис і "
+"пунктуацію, опубліковану на www.cadastre.gouv.fr </html>"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
+msgid "Departement"
+msgstr "Відділ"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
+msgid "<html>Departement number (optional)</html>"
+msgstr "<html>Номер відділку (опціонально)</html>"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:99
+msgid "Add new layer"
+msgstr "Додати новий шар"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
+msgid "Reset cookie"
+msgstr "Скинути файли кукі"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:18
+msgid "Get a new cookie (session timeout)"
+msgstr "Отримати нові файли кукі (сесія закінчилась)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
+msgid "PNG files (*.png)"
+msgstr "PNG файли (*.png)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:45
+msgid "Export as PNG format (only raster images)"
+msgstr "Експорт у PNG формат (тільки растрові зображення)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:39
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:41
+msgid "Adjust WMS"
+msgstr "Підлаштувати WMS"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:40
+msgid "Adjust the position of the WMS layer (raster images only)"
+msgstr "Підлаштувати розташування шару WMS (тільки растрові зображення)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:68
+msgid ""
+"This mode works only if active layer is\n"
+"a cadastre \"plan image\" (raster image)"
+msgstr ""
+"Цей режим працює тільки, якщо активний шар\n"
+"є «зображенням плану» кадастру (растрове зображення)"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:47
+msgid ""
+"More than one WMS layer present\n"
+"Select one of them first, then retry"
+msgstr ""
+"Присутній більше, ніж один шар WMS.\n"
+"Виберіть спочатку один із них, а потім повторіть."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:96
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:75
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:187
+msgid "Blank Layer"
+msgstr "Порожній шар"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:245
+#, java-format
+msgid "WMS layer ({0}), {1} tile(s) loaded"
+msgstr "Шар WMS ({0}), {1} квадрат(и,ів) завантажено"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:247
+msgid "Is not vectorized."
+msgstr "Не векторизований."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:248
+#, java-format
+msgid "Raster size: {0}"
+msgstr "Розмір растру: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:250
+msgid "Is vectorized."
+msgstr "Векторизований."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:251
+#, java-format
+msgid "Commune bbox: {0}"
+msgstr "Габаритний прямокутник общини: {0}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:484
+#, java-format
+msgid ""
+"Unsupported cache file version; found {0}, expected {1}\n"
+"Create a new one."
+msgstr ""
+"Непідтримувана версія кеш-файлу; знайдено {0}, очікувалось {1}\n"
+"Створіть новий."
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:485
+msgid "Cache Format Error"
+msgstr "Помилка формату кешу"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:509
+#, java-format
+msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
+msgstr "Зона Lambert {0} в кеші не сумісна з поточною зоною Lambert {1}"
+
+#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:511
+msgid "Cache Lambert Zone Error"
+msgstr "Помилка кешу зони Lambert"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
+msgid "Use"
+msgstr "Використати"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
+msgid "Please select a scheme to use."
+msgstr "Будь ласка, оберіть схему що буде використовуватись."
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:82
+msgid "Color Scheme"
+msgstr "Схема кольорів"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:96
+msgid "Please select the scheme to delete."
+msgstr "Будь ласка, оберіть схему для вилучення."
+
+#. schemesList.setToolTipText(tr("The sources (url or filename) of annotation preset definition files. See http://josm.eigenheimstrasse.de/wiki/AnnotationPresets for help."));
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:108
+msgid "Use the selected scheme from the list."
+msgstr "Використовувати обрану схему зі списку"
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:109
+msgid "Use the current colors as a new color scheme."
+msgstr "Використовувати поточні кольори в якості нової колірної схеми."
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:110
+msgid "Delete the selected scheme from the list."
+msgstr "Вилучити обрану схему зі списку."
+
+#: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:112
+msgid "Color Schemes"
+msgstr "Колірні схеми"
+
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:39
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:43
+msgid "Split area"
+msgstr "Розділити ділянку"
+
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
+msgid "Splits an area by an untagged way."
+msgstr "Розділити ділянку по лінії без теґів"
+
+#: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78
+msgid ""
+"The selected area cannot be splitted, because it is a member of some "
+"relation.\n"
+"Remove the area from the relation before splitting it."
+msgstr ""
+"Виділена ділянка не може бути розділеною, тому що вона є членом зв’язку.\n"
+"Вилучіть її із зв’язку перед розділенням."
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:37
+msgid "TangoGPS Files (*.log)"
+msgstr "Файли TangoGPS (*.log)"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+msgid "Format errors: "
+msgstr "Помилки формату: "
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+msgid "TangoGPS import success"
+msgstr "Імпорт TangoGPS завершений"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+msgid "TangoGPS import failure!"
+msgstr "Імпрот TangoGPS не вдався"
+
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
+msgid "TCX Files (*.tcx)"
+msgstr "TCX файли (*.tcx)"
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
+msgid "Duplicate Way"
+msgstr "Дублювати лінію"
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:76
+msgid "Duplicate selected ways."
+msgstr "Дублювати виділені лінії."
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:109
+msgid "Can't duplicate unordered way."
+msgstr "Неможливо дублювати невпорядковану лінію."
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:120
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:90
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:134
+msgid "No data loaded."
+msgstr "Не завантажено дані."
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:126
+msgid "You must select at least one way."
+msgstr "Ви повинні виділити, принаймні, одну лінію."
+
+#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:240
+msgid "Create duplicate way"
+msgstr "Створити дублікат лінії"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
+msgid "Layer for editing GPX tracks"
+msgstr "Шар для редагування GPX треків"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
+msgid "Convert to GPX layer with anonymised time"
+msgstr "Перетворити на GPX шар зі знеособленим часом"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:49
+msgid "edit gpx tracks"
+msgstr "Редагувати gpx треки"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:88
+msgid "EditGpx"
+msgstr "Редагувати Gpx"
+
+#. TODO what is icon at the end?
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
+msgid "Import path from GPX layer"
+msgstr "Імпортувати шлях із шару даних GPX"
+
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
+msgid "Drop existing path"
+msgstr "Очистити існуючий шлях"
+
+#. no gps layer
+#. TODO: register a listener and show menu entry only if gps layers are available
+#. no gps layer
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
+msgid "No GPX data layer found."
+msgstr "Не знайдено шару даних GPX"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:81
+msgid "Position only"
+msgstr "Тільки положення"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:82
+msgid "Position, Time, Date, Speed"
+msgstr "Положення, Час, Дата, Швидкість"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:83
+msgid "Position, Time, Date, Speed, Altitude"
+msgstr "Положення, Час, Дата, Швидкість, Висота"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:85
+msgid "A By Time"
+msgstr "А — За часом"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:86
+msgid "A By Distance"
+msgstr "А — По відстані"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:87
+msgid "B By Time"
+msgstr "Б — За часом"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:88
+msgid "B By Distance"
+msgstr "Б — За відстанню"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:89
+msgid "C By Time"
+msgstr "В — За часом"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:90
+msgid "C By Distance"
+msgstr "В — За відстанню"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:137
+msgid "Data Logging Format"
+msgstr "Формат журналу даних"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:151
+msgid "Disable data logging if speed falls below"
+msgstr "Відключити реєстрацію даних, якщо швидкість падає нижче"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:177
+msgid "Disable data logging if distance falls below"
+msgstr "Відключити реєстрацію даних, якщо відстань стає менше"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java:307
+msgid "Unknown logFormat"
+msgstr "Невідомий формат реєстрації даних"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:86
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:94
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:134
+msgid "Refresh"
+msgstr "Оновити"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:100
+msgid "refresh the port list"
+msgstr "оновити список портів"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:108
+msgid "Configure"
+msgstr "Налаштувати"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:116
+msgid "Configure Device"
+msgstr "Налаштування пристрою"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:125
+msgid "Connection Error."
+msgstr "Помилка підключення."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:130
+msgid "configure the connected DG100"
+msgstr "налаштування підключеного DG100"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java:139
+msgid "delete data after import"
+msgstr "вилучити дані після імпорту"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:44
+msgid "Importing data from device."
+msgstr "Імпортувати дані з пристрою"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:49
+msgid "Importing data from DG100..."
+msgstr "Імпортувати дані з DG100…"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:63
+msgid "Error deleting data."
+msgstr "Помилка вилучення даних"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:69
+#, java-format
+msgid "imported data from {0}"
+msgstr "імпортовано дані з {0}"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:72
+msgid "No data found on device."
+msgstr "На пристрої немає даних"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:77
+msgid "Connection failed."
+msgstr "Невдале підключення."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:97
+msgid ""
+"Cannot load library rxtxSerial. If you need support to install it try "
+"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
+"plugin/"
+msgstr ""
+"Не вдається завантажити бібліотеку rxtxSerial.Якщо вам потрібна консультація "
+"зі встановлення, завітайте до Домівки Globalsat за адресою http://www."
+"raphael-mack.de/josm-globalsat-gpx-import-plugin/"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:107
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:109
+msgid "Globalsat Import"
+msgstr "Імпорт Globalsat"
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:108
+msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
+msgstr "Імпорт даних з Globalsat Datalogger DG100 у шар GPX."
+
+#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:115
+msgid "Import"
+msgstr "Імпортувати"
+
+#: ../plugins/grid/src/grid/GridLayer.java:192
+msgid "Grid origin location"
+msgstr "Сітка основного місцезнаходження"
+
+#: ../plugins/grid/src/grid/GridLayer.java:197
+msgid "Grid rotation"
+msgstr "Обертання сітки"
+
+#: ../plugins/grid/src/grid/GridLayer.java:199
+msgid "World"
+msgstr "Світ"
+
+#: ../plugins/grid/src/grid/GridLayer.java:200
+msgid "Grid layout"
+msgstr "Розмітка сітки"
+
+#: ../plugins/grid/src/grid/GridLayer.java:222
+msgid "Grid layer:"
+msgstr "Шар сітки:"
+
+#: ../plugins/grid/src/grid/GridPlugin.java:27
+msgid "Add grid"
+msgstr "Додати сітку"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:56
+msgid "Normal"
+msgstr "Звичайний"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:57
+msgid "Rotate 90"
+msgstr "Повернути на 90°"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:59
+msgid "Rotate 180"
+msgstr "Повернути на 180°"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageEntry.java:61
+msgid "Rotate 270"
+msgstr "Повернути на 270°"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:108
+msgid "Previous image"
+msgstr "Попереднє зображення"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
+msgid "Next image"
+msgstr "Наступне зображення"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:144
+msgid "Rotate left"
+msgstr "Повернути вліво"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:146
+msgid "Rotate image left"
+msgstr "Повернути зображення ліворуч"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:163
+msgid "Rotate right"
+msgstr "Повернути вправо"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:165
+msgid "Rotate image right"
+msgstr "Повернути зображення праворуч"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:187
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:190
+msgid "WayPoint Image"
+msgstr "Зображення з точки шляху"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:189
+msgid "Display non-geotagged photos"
+msgstr "Показати фотографії, що не мають координат"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointLayer.java:75
+msgid "Imported Images"
+msgstr "Імпортовані зображення"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:35
+msgid "Image files (*.jpg, *.jpeg, *.png, *.gif)"
+msgstr "Файли зображень (*.jpg, *.jpeg, *.png, *.gif)"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:45
+msgid "Open images with ImageWayPoint"
+msgstr "Відкрити зображення в ImageWayPoint"
+
+#: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointPlugin.java:47
+msgid "Load set of images as a new layer."
+msgstr "Завантажити набір зображень як новий шар."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
+msgid "Direction index '{0}' not found"
+msgstr "Індекс напрямку '{0}' не знайдений"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
+msgid "The starting location was not within the bbox"
+msgstr "Початкове місцезнаходження за межами габаритного прямокутника"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
+msgid "Looking for shoreline..."
+msgstr "Пошук берегової лінії…"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
+#, java-format
+msgid "{0} nodes so far..."
+msgstr "{0} точок на даний момен…"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+msgid "Lake Walker."
+msgstr "Трасувальник озер."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java:19
+msgid "Lake Walker"
+msgstr "Трасувальник озер"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:113
+#, java-format
+msgid "Error creating cache directory: {0}"
+msgstr "Помилка створення каталогу для кешу: {0}"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:146
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:75
+msgid "Tracing"
+msgstr "Трасування"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:148
+msgid "checking cache..."
+msgstr "перевірка кешу…"
+
+#. *
+#. * Run the nodelist through a vertex reduction algorithm
+#.
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:188
+msgid "Running vertex reduction..."
+msgstr "Спрощення геометрії…"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:199
+msgid "Running Douglas-Peucker approximation..."
+msgstr "Апроксимація Дугласа-П’юкера"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:210
+msgid "Removing duplicate nodes..."
+msgstr "Вилучення дублікатів точок…"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
+msgid "Lakewalker trace"
+msgstr "Намітка трасувальника озер"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerException.java:14
+msgid "An unknown error has occurred"
+msgstr "Сталась невідома помилка"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+msgid "east"
+msgstr "схід"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+msgid "northeast"
+msgstr "північний схід"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+msgid "north"
+msgstr "північ"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+msgid "northwest"
+msgstr "північний захід"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "west"
+msgstr "захід"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "southwest"
+msgstr "південний захід"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "south"
+msgstr "південь"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
+msgid "southeast"
+msgstr "південний схід"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+msgid "coastline"
+msgstr "узбережжя"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+msgid "land"
+msgstr "земля"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
+msgid "Maximum number of segments per way"
+msgstr "Максимальна кількість відрізків для однієї лінії"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
+msgid "Maximum number of nodes in initial trace"
+msgstr "Максимальна кількість точок на первинній намітці"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
+msgid "Maximum gray value to count as water (0-255)"
+msgstr "Самий світлий відтінок сірого, який вважати водою (0-255)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
+msgid "Line simplification accuracy (degrees)"
+msgstr "Точність спрощення ліній (ступені)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
+msgid "Resolution of Landsat tiles (pixels per degree)"
+msgstr "Розподільча здатність квадратів Landsat (пікселів на градус)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
+msgid "Size of Landsat tiles (pixels)"
+msgstr "Розмір квадратів Landsat (пікселів)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
+msgid "Shift all traces to east (degrees)"
+msgstr "Здвинути усі намітки на схід (градуси)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
+msgid "Shift all traces to north (degrees)"
+msgstr "Здвинути усі намітки на північ (градуси)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
+msgid "Direction to search for land"
+msgstr "Напрямок для пошуку землі"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
+msgid "Tag ways as"
+msgstr "Позначити лінії як:"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
+msgid "WMS Layer"
+msgstr "WMS шар"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
+msgid "Maximum cache size (MB)"
+msgstr "Максимальний розмір кешу (MB)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
+msgid "Maximum cache age (days)"
+msgstr "Зберігати кеш протягом (днів)"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
+msgid "Source text"
+msgstr "Оригінальний текст"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+msgid "Maximum number of segments allowed in each generated way. Default 250."
+msgstr ""
+"Максимальна кількість відрізків у створюваних лініях. Початкове значення — "
+"250."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+msgid ""
+"Maximum number of nodes to generate before bailing out (before simplifying "
+"lines). Default 50000."
+msgstr ""
+"Максимальна кількість створюваних точок перед з’єднанням з початковою точкою "
+"(до спрощення лінії). Початкове значення —  50 000."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+msgid ""
+"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
+"in the range 0-255. Default 90."
+msgstr ""
+"Максимальне значення сірого, яке вважати водою (на основі даних Landsat IR-"
+"1). Може бути в діапазоні 0-255, початкове значення — 90."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+msgid ""
+"Accuracy of Douglas-Peucker line simplification, measured in degrees."
+"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgstr ""
+"Точність апроксимації Дугласа-П’юкера для спрощення ліній, вимірювана в "
+"градусах.<br>Більш низькі значення дають більше точок, а також більш точні "
+"лінії. Початкове значення — 0,0003."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+msgid ""
+"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgstr ""
+"Розподільча здатність квадратів з Landsat, пікселів на градус. Початкове "
+"значення — 4 000."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+msgid "Size of one landsat tile, measured in pixels. Default 2000."
+msgstr ""
+"Розмір одного квадрату Landsat, в пікселях. Початкове значення — 2 000,"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+msgid "Offset all points in East direction (degrees). Default 0."
+msgstr ""
+"Змістити всі точки в східному напрямку (в градусах). Початкове значення — 0."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+msgid "Offset all points in North direction (degrees). Default 0."
+msgstr ""
+"Змістити всі точки в північному напрямку (у градусах). Початкове значення — "
+"0."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+msgid "Direction to search for land. Default east."
+msgstr "Напрямок пошуку землі. Типово — схід."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+msgid "Tag ways as water, coastline, land or nothing. Default is water."
+msgstr ""
+"Позначити лінії теґом: water (вода), coastline (берегова лінія), land "
+"(суша), або нічого. Типово — вода."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+msgid "Which WMS layer to use for tracing against. Default is IR1."
+msgstr "Який шар WMS використовувати для трасування? Типово — IR1."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+msgid "Maximum size of each cache directory in bytes. Default is 300MB"
+msgstr "Максимальний розмір кожного каталогу кешу в байтах. Типово — 300MB"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+msgid "Maximum age of each cached file in days. Default is 100"
+msgstr "Максимальний термін зберігання файлів у кеші (днів). Типово — 100"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
+msgid "Data source text. Default is Landsat."
+msgstr "Дані вихідного тексту. Типово Landsat."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+msgid "A plugin to trace water bodies on Landsat imagery."
+msgstr "Втулок для нанесенні водойм по зображеннях з Landsat"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
+msgid "Lakewalker Plugin Preferences"
+msgstr "Налаштування втулка Трасувальника озер"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
+msgid "Downloading image tile..."
+msgstr "Заватажується зображення квадрату мапи…"
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
+msgid "Could not acquire image"
+msgstr "Не вдалось отримати зображення"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:125
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:146
+msgid "Connecting"
+msgstr "З'єднується"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:212
+msgid "Connected"
+msgstr "З'єднано"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:226
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:253
+msgid "Not connected"
+msgstr "Не з'єднано"
+
+#: ../plugins/livegps/src/livegps/LiveGpsAcquirer.java:241
+msgid "Connection Failed"
+msgstr "Невдала спроба з’єднання"
+
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
+msgid "no name"
+msgstr "без назви"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:46
+msgid "Live GPS"
+msgstr "GPS наживо"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:45
+msgid "Show GPS data."
+msgstr "Показати GPS-дані."
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:50
+msgid "Status"
+msgstr "Стан"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:52
+msgid "Way Info"
+msgstr "Інформація про лінію"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:58
+msgid "Speed"
+msgstr "Швидкість"
+
+#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:60
+msgid "Course"
+msgstr "Курс"
+
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+msgid "LiveGPS layer"
+msgstr "Шар LiveGPS"
+
+#: ../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 "Захоплення GPS-треків"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:56
+msgid "Connect to gpsd server and show current position in LiveGPS layer."
+msgstr ""
+"Під’єднатись до сервера gpsd і показати поточне положення на шарі LiveGPS."
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:69
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:72
+msgid "Center Once"
+msgstr "Центрувати тільки один раз"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:70
+msgid "Center the LiveGPS layer to current position."
+msgstr "Центрувати шар LiveGPS у поточному положенні."
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:86
+msgid "Auto-Center"
+msgstr "Авто-центрування"
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:88
+msgid "Continuously center the LiveGPS layer to current position."
+msgstr "Безпереривно центрувати шар LiveGPS на поточному положенні."
+
+#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:120
+msgid "LiveGPS"
+msgstr "LiveGPS"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:67
+msgid "Measured values"
+msgstr "Виміряні значення"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:66
+msgid "Open the measurement window."
+msgstr "Відкрити вікно вимірювань."
+
+#. Create popup menu
+#. Reset submenu
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:72
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:97
+msgid "Reset"
+msgstr "Скинути"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:73
+msgid "Reset current measurement results and delete measurement path."
+msgstr ""
+"Скидання поточних результатів вимірювань та вилучення вимірювального шляху."
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:79
+msgid "Path Length"
+msgstr "Довжина шляху"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:84
+msgid "Selection Length"
+msgstr "Довжина виділення"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:89
+msgid "Selection Area"
+msgstr "Область виділення"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:94
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java:44
+msgid "Angle"
+msgstr "Кут"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java:95
+msgid "Angle between two selected Nodes"
+msgstr "Кут між двома виділеними точками"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
+msgid "Layer to make measurements"
+msgstr "Шар для проведення вимірювань"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementMode.java:47
+msgid "Can not draw outside of the world."
+msgstr "Не вдається зробити за межами світу."
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:23
+msgid "measurement mode"
+msgstr "режим вимірювання"
+
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:39
+msgid "Measurements"
+msgstr "Вимірювання"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46
+msgid "Michigan Left"
+msgstr "Мічиганський поворот ліворуч"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:46
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr "Додає заборону повороту ліворуч на групу з 4 або 5 ліній."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:59
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Будь ласка, виберіть 4 або 5 ліній, щоб призначити заборону повороту ліворуч."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:79
+msgid "Please select 4 ways that form a closed relation."
+msgstr "Будь ласка, виділить 4 лінії, що утворюють закрити’ зв’язок."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:106
+msgid "Unable to order the ways. Please verify their directions"
+msgstr "Не можливо впорядкувати лінії. Будь ласка, перевірте їх напрямки"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:120
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:197
+msgid "Create Michigan left turn restriction"
+msgstr "Створити обмеження повороту ліворуч (Мічіган)"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeft.java:154
+msgid "Unable to find via nodes. Please check your selection"
+msgstr "Неможливо знайти точки «крізь». Будь ласка, перевірте свій вибір"
+
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:38
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:41
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:22
+msgid "Convert to multipolygon"
+msgstr "Перетворити на мультіполігон"
+
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:39
+msgid "Convert to multipolygon."
+msgstr "Перетворити на мультіполігон."
+
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:81
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:94
+msgid "One of the selected ways is already part of another multipolygon."
+msgstr "Одна з виділених ліній вже є частиною іншого мультіполігону."
+
+#. Commit
+#: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:118
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:48
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:51
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:160
+#: ../plugins/multipoly/src/multipoly/MultipolyPlugin.java:21
+msgid "Create multipolygon"
+msgstr "Створити мультіполігон"
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:49
+msgid "Create multipolygon."
+msgstr "Створити мультіполігон."
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:120
+msgid "Multipolygon must consist only of closed ways."
+msgstr "Мультіполігон повинен складатися тільки з замкнутих ліній."
+
+#: ../plugins/multipoly/src/multipoly/MultipolyAction.java:140
+msgid "You must select at least two ways."
+msgstr "Ви повинні виділити, як мінімум, дві лінії."
+
+#: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:46
+msgid "OpenLayers"
+msgstr "OpenLayers"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbDownloadLoop.java:52
+msgid "OpenStreetBugs download loop"
+msgstr "Цикл завантаження OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java:114
+msgid "Displays OpenStreetBugs issues"
+msgstr "Показати проблеми з OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:106
+msgid ""
+"<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A "
+"new server is available at schokokeks.org.<br>Do you want to switch to the "
+"new server? (Strongly recommended)</html>"
+msgstr ""
+"<html>Втулок openstreetbugs використовує старий сервер appspot.com.<br>Новий "
+"сервер доступний на schokokeks.org.<br>Ви хочете, перейти на новий сервер? "
+"(Настійно рекомендується)</html>"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:109
+msgid "Switch to new openstreetbugs server?"
+msgstr "Перейти на новий сервер openstreetbugs?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
+msgid ""
+"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
+"upload this data. Maybe you have selected the wrong layer?"
+msgstr ""
+"<html>Вибрані дані містять дані з OpenStreetBugs.<br>Ви не можете надіслати "
+"ці дані. Можливо, ви вибрали неправильний шар?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/CloseAction.java:64
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/EditAction.java:69
+#, java-format
+msgid "An error occurred: {0}"
+msgstr "Сталася помилка: {0}"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java:76
+msgid "Couldn't create new bug. Result: {0}"
+msgstr "Не вдалося створити повідомлення про нову помилку. Результат: {0}"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/util/HttpUtils.java:169
+msgid "Header contains several values and cannot be mapped to a single string"
+msgstr ""
+"Заголовок містить кілька значень і не може бути представлений  одним рядком"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
+msgid "Process queue"
+msgstr "Обробити чергу"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:112
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:114
+msgid "Open OpenStreetBugs"
+msgstr "Відкрити OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:113
+msgid "Opens the OpenStreetBugs window and activates the automatic download"
+msgstr "Відкриває вікно OpenStreetBugs і активує автоматичне завантаження"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:119
+msgid "Bug list"
+msgstr "Список помилок"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:142
+msgid ""
+"The visible area is either too small or too big to download data from "
+"OpenStreetBugs"
+msgstr ""
+"Видима ділянка, або занадто маленька чи занадто велика для завантаження "
+"даних з OpenStreetBugs"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:186
+msgid "Queue"
+msgstr "Черга"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414
+msgid "offline"
+msgstr "автономний режим"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414
+msgid "online"
+msgstr "в мережі"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:414
+#, java-format
+msgid "OpenStreetBugs ({0})"
+msgstr "OpenStreetBugs ({0})"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:71
+msgid "Add a comment"
+msgstr "Додати коментар"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:72
+msgid "Enter your comment"
+msgstr "Введіть Ваш коментар"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
+msgid "Comment: "
+msgstr "Коментар: "
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
+msgid "Mark as done"
+msgstr "Відмітити як виконане"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:72
+msgid "Really close?"
+msgstr "Дійсно закрити?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
+msgid ""
+"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
+"comment:</html>"
+msgstr ""
+"<html>Дійсно відзначити цю проблему як \"вирішену\"?<br><br>Ви можете додати "
+"необов’язковий коментар:</html>"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
+msgid "Close: "
+msgstr "Закрити: "
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PointToNewIssueAction.java:54
+msgid "New issue"
+msgstr "Нова проблема"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:75
+msgid "Create issue"
+msgstr "Вказати нову проблему"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:76
+msgid "Describe the problem precisely"
+msgstr "Опишіть проблему як можна докладніше"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
+msgid "Create: "
+msgstr "Створити: "
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
+msgid "Please enter a user name"
+msgstr "Будь ласка, введіть ім'я користувача"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/PopupFactory.java:50
+msgid "Unknown issue state"
+msgstr "Невідомий статус проблеми"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
+msgid "Switch to online mode"
+msgstr "Перейдіть в режим онлайн"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
+msgid "Switch to offline mode"
+msgstr "Перейти у автономний режим"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
+msgid "You have unsaved changes in your queue. Do you want to submit them now?"
+msgstr ""
+"У вас є не збережені зміни у вашій черзі. Ви хочете відправити їх зараз?"
+
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
+msgid "OpenStreetBugs"
+msgstr "OpenStreetBugs"
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:50
+msgid "Open Visible..."
+msgstr "Відкрити видиме…"
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:49
+msgid "Open only files that are visible in current view."
+msgstr "Відкривайте тільки файли, які є видимими у поточному виді."
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:59
+msgid "No view open - cannot determine boundaries!"
+msgstr "Вид не відкритий — неможливо визначити межі!"
+
+#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:114
+#, java-format
+msgid "Unknown file extension: {0}"
+msgstr "Невідоме розширення файлу: {0}"
+
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:46
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:139
+msgid "Osmarender"
+msgstr "Osmarender"
+
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
+msgid ""
+"Firefox not found. Please set firefox executable in the Map Settings page of "
+"the preferences."
+msgstr ""
+"Firefox не знайдено. Будь ласка, вкажіть виконуваний файл Firefox на "
+"сторінці налаштування мапи у вікні налаштувань."
+
+#: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
+msgid "Firefox executable"
+msgstr "виконуваний файл Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:45
+msgid "Read error!"
+msgstr "Помилка читання!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:47
+msgid "Write error!"
+msgstr "Помилка запису!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:63
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+"Записати інформацію про місце знаходження в exif-розділ наступних файлів:"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:79
+msgid "settings"
+msgstr "налаштування"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:82
+msgid "keep backup files"
+msgstr "зберегти резервні копії"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:85
+msgid "change file modification time:"
+msgstr "зміни час модифікації файлу:"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+msgid "to gps time"
+msgstr "на час за gps"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:88
+msgid "to previous value (unchanged mtime)"
+msgstr "на попереднє значення (незмінений mtime)"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:109
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:140
+msgid "Photo Geotagging Plugin"
+msgstr "Втулок геопозначення фотографій"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:147
+msgid "Writing position information to image files..."
+msgstr "Запис інформації про місце знаходження у файли зображень…"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:171
+msgid "Could not read mtime."
+msgstr "Неможливо прочитати mtime."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:184
+msgid "Could not write mtime."
+msgstr "Неможливо записати mtime."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:224
+msgid "File could not be deleted!"
+msgstr "Файл не може бути знищений!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:231
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:245
+msgid "Could not rename file!"
+msgstr "Не вдається перейменувати файл!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:254
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr "<html><h3>Існують старі резервні файли в каталозі зображень!</h3>"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:258
+msgid "Override old backup files?"
+msgstr "Замінити старі резервні копії?"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+msgid "Keep old backups and continue"
+msgstr "Зберігайте старі резервні копії і продовжити"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+msgid "Override"
+msgstr "Перезаписати"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:280
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:296
+msgid "Could not delete temporary file!"
+msgstr "Не вдалося вилучити тимчасовий файл!"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:292
+msgid "Test failed: Could not read mtime."
+msgstr "Тест не пройдено: Неможливо прочитати mtime."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:294
+msgid "Test failed: Could not write mtime."
+msgstr "Тест не пройдено: Не можу записати mtime."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:37
+msgid "Write coordinates to image header"
+msgstr "Записати координати в заголовок зображення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/CalibrationFileFilter.java:48
+msgid "Calibration Files"
+msgstr "Файли калібрування"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
+msgid "Load Picture Calibration..."
+msgstr "Завантажити калібрування зображення…"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:53
+msgid "Loads calibration data to a file"
+msgstr "Завантажити дані калібрування у файл"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/LoadPictureCalibrationAction.java:79
+#, java-format
+msgid "Loading file failed: {0}"
+msgstr "Не вдалося завантажити файл: {0}"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
+msgid "PicLayer move"
+msgstr "Пересування PicLayer"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/MovePictureAction.java:55
+msgid "Drag to move the picture"
+msgstr "Тягніть, щоб зрушити зображення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromClipboardAction.java:42
+msgid "New picture layer from clipboard"
+msgstr "Новий шар зображення з буфера обміну"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:64
+msgid "Image files"
+msgstr "Файли зображення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:73
+msgid "New picture layer from file..."
+msgstr "Новий шар зображення з файлу…"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
+msgid "Image not created properly."
+msgstr "Зображення не створено належним чином."
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
+msgid "Could not find the map object."
+msgstr "Не можливо знайти об’єкт на мапі"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:45
+msgid "Nothing in clipboard"
+msgstr "У буфері обміну нічого немає"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromClipboard.java:54
+msgid "The clipboard data is not an image"
+msgstr "Дані буфера обміну не є зображенням"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
+msgid "PicLayer"
+msgstr "PicLayer"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAllAction.java:44
+msgid "Resets picture calibration"
+msgstr "Скинути калібрування зображення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureAngleAction.java:44
+msgid "Resets picture rotation"
+msgstr "Скинути поворот зображення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
+msgid "Reset position"
+msgstr "Скинути переміщення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPicturePositionAction.java:44
+msgid "Resets picture position"
+msgstr "Скидання положення зображення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
+msgid "Scale"
+msgstr "Масштабування"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ResetPictureScaleAction.java:44
+msgid "Resets picture scale"
+msgstr "Скидання масштабування зображення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
+msgid "PicLayer rotate"
+msgstr "Повернути PicLayer"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/RotatePictureAction.java:54
+msgid "Drag to rotate the picture"
+msgstr "Тягніть, щоб повернути зображення"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
+msgid "Save Picture Calibration..."
+msgstr "Зберегти калібрування зображення…"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:52
+msgid "Saves calibration data to a file"
+msgstr "Зберігає дані калібрування в файл"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:81
+msgid "JOSM PicLayer plugin calibration data"
+msgstr "Дані калібрування втулку JOSM PicLayer"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/SavePictureCalibrationAction.java:85
+#, java-format
+msgid "Saving file failed: {0}"
+msgstr "Не вдалося зберегти файл: {0}"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
+msgid "PicLayer scale X"
+msgstr "Масштабування PicLayer по X"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXPictureAction.java:41
+msgid "Drag to scale the picture in the X Axis"
+msgstr "Тягніть, щоб масштабувати зображення по осі X"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
+msgid "PicLayer scale"
+msgstr "Масштабування PicLayer"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleXYPictureAction.java:41
+msgid "Drag to scale the picture in the X and Y Axis"
+msgstr "Тягніть, щоб масштабувати зображення по осях X і Y"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
+msgid "PicLayer scale Y"
+msgstr "Масштабування PicLayer по Y"
+
+#: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/ScaleYPictureAction.java:41
+msgid "Drag to scale the picture in the Y Axis"
+msgstr "Тягніть, щоб масштабувати зображення по осі Y"
+
+#. item "Bicycle/Rental" text "Name"
+#: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
+#: build/trans_presets.java:1412
+msgid "Public Transport"
+msgstr "Громадський транспорт"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:409
+msgid "Route patterns ..."
+msgstr "Шаблони маршрутів…"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:410
+msgid "Edit Route patterns for public transport"
+msgstr "Правити шаблони маршрутів громадського транспорту"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:422
+msgid "Overview"
+msgstr "Огляд"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:426
+msgid "Itinerary"
+msgstr "Маршрут"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:428
+#: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:87
+msgid "Stops"
+msgstr "Зупинки"
+
+#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:430
+msgid "Meta"
+msgstr ""
+
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:74
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:109
+msgid "Create Stops from GPX ..."
+msgstr "Створити зупинки по GPX…"
+
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:75
+msgid "Create Stops from a GPX file"
+msgstr "Створити зупинки з файла GPX"
+
+#: ../plugins/public_transport/src/public_transport/StopImporterAction.java:230
+#, java-format
+msgid "IOException \"{0}\" occurred"
+msgstr "Сталася помилка вводу/виводу \"{0}\""
+
+#: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83
+msgid "Tracks"
+msgstr "Треки"
+
+#. item "Ways/Steps" text "Width (meters)"
+#. </optional>
+#: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
+#: build/trans_presets.java:621
+msgid "Waypoints"
+msgstr "Точки дороги"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
+msgid "load data from API"
+msgstr "завантажити дані з API"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
+msgid "create new objects"
+msgstr "створити нові об'єкти"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:29
+msgid "change the selection"
+msgstr "мінити виділення"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:30
+msgid "change the viewport"
+msgstr "змінити область перегляду на екрані"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:31
+msgid "confirm all Remote Control actions manually"
+msgstr "підтверджувати всі дії віддаленого управління вручну."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
+msgid "A plugin that allows JOSM to be controlled from other applications."
+msgstr "Втулок, що дозволяє іншим програмам керувати JOSM"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+msgid "Remote Control"
+msgstr "Дистанційне керування"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
+msgid "Settings for the Remote Control plugin."
+msgstr "Налаштування втулка віддаленого керування"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
+msgid ""
+"The Remote Control plugin will always listen on port 8111 on localhost.The "
+"port is not variable because it is referenced by external applications "
+"talking to the plugin."
+msgstr ""
+"Втулок відділеного керування (Remote Control) завжди прослуховує порт 8111 "
+"на localhost. Номер порту не можна змінити, так як він є стандартним для "
+"сторонніх застосунків, що підключаються до втулка."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
+msgid "Permitted actions"
+msgstr "Дозволені дії"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:124
+msgid "Remote Control has been asked to load data from the API."
+msgstr ""
+"Втулок віддаленого керування отримав запит на завантаження даних з API."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#, java-format
+msgid "Request details: {0}"
+msgstr "Деталі запиту: {0}"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:125
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:235
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:248
+msgid "Do you want to allow this?"
+msgstr "Дозволити дію?"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:126
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:236
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:249
+msgid "Confirm Remote Control action"
+msgstr "Підтвердити дії Віддаленого керування"
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:234
+msgid "Remote Control has been asked to create a new node."
+msgstr "Втулок віддаленого управління отримав запит на створення нової точки."
+
+#: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:246
+msgid "Remote Control has been asked to import data from the following URL:"
+msgstr ""
+"Втулок віддаленого управління отримав запит на імпорт даних з наступного "
+"посилання:"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+#: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr "Історія об’єктів"
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
+#, fuzzy
+msgid "Revert"
+msgstr "У зворотному порядку"
+
+#: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr "Повернення з історії"
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr "Підготовка даних історії…"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr "Відмінити набір змін"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
+#, fuzzy
+msgid "Reverting..."
+msgstr "Зв’язок…"
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
+msgid "Revert changeset #{0}"
+msgstr "Повернути набір змін #{0}"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
+msgid "Edit relation"
+msgstr "Редагувати зв’язок"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
+msgid "Edit relations"
+msgstr "Редагувати зв’язки"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:73
+msgid "No relation is selected"
+msgstr "Не виділено жодного зв’язку"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:70
+#, java-format
+msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
+msgstr "Вилучити точку ''{0}'' в позиції {1} зі зв’язку ''{2}''"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:71
+#, java-format
+msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
+msgstr "Вилучити лінію ''{0}'' в позиції {1} зі зв’язку ''{2}''"
+
+#: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:72
+#, java-format
+msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
+msgstr "Вилучити зв’язок ''{0}'' в позиції {1} зі зв’язку ''{2}''"
+
+#. TODO Use constructor with shortcut
+#: ../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
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:76
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:69
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:77
+msgid "Routing"
+msgstr "Маршрутизація"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java:73
+msgid "Click to add destination."
+msgstr "Натисніть, щоб додати місце призначення"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
+msgid "Click and drag to move destination"
+msgstr "Натисніть та тягніть, щоб перемістити місце призначення"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
+msgid "Click to remove destination"
+msgstr "Натисніть, щоб вилучити місце призначення"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java:68
+msgid "Open a list of routing nodes"
+msgstr "Відкрити список точок маршруту"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:79
+msgid "Add routing layer"
+msgstr "Додати шар маршрутизації"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:90
+msgid "Criteria"
+msgstr "Критерій"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:92
+msgid "Shortest"
+msgstr "Найкоротший"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:115
+msgid "Fastest"
+msgstr "Найшвидший"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:141
+msgid "Reverse route"
+msgstr "Зворотній маршрут"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java:154
+msgid "Clear route"
+msgstr "Очистити маршрут"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
+msgid "Routing Plugin Preferences"
+msgstr "Налаштування втулку маршрутизації"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
+msgid "Configure routing preferences."
+msgstr "Задати налаштування маршрутизації"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
+msgid "Highway type"
+msgstr "Тип дороги"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:92
+msgid "Speed (Km/h)"
+msgstr "Швидкість (км/г)"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:114
+msgid "Weight"
+msgstr "Вага"
+
+#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:123
+msgid "Enter weight values"
+msgstr "Введіть обмеження ваги"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:139
+msgid "Slippy Map"
+msgstr "Рухлива мапа"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:150
+msgid "Auto Zoom"
+msgstr "Автомасштабування"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:159
+msgid "Load Tile"
+msgstr "Завантажити квадрат мапи"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:169
+msgid "Show Tile Info"
+msgstr "Показати дані квадрату"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:191
+msgid "Load All Tiles"
+msgstr "Завантажити всі квадрати мапи"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:200
+msgid "Increase zoom"
+msgstr "Збільшити масштаб"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:208
+msgid "Decrease zoom"
+msgstr "Зменшити масштаб"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:218
+msgid "Snap to tile size"
+msgstr "Прив'язатися до розміру квадрата"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:234
+msgid "Flush Tile Cache"
+msgstr "Очистити кеш квадратів мапи"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:673
+msgid "image "
+msgstr "зображення "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:37
+msgid "autozoom"
+msgstr "автомасштабування"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:38
+msgid "autoload tiles"
+msgstr "автозавантаження квадратів"
+
+#. String description = tr("A plugin that adds to JOSM new layer. This layer could render external tiles.");
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+msgid "SlippyMap"
+msgstr "Рухлива мапа"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:48
+msgid "Settings for the SlippyMap plugin."
+msgstr "Налаштування втулка Рухлива мапа."
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:54
+msgid "Tile Sources"
+msgstr "Джерела квадратів мапи"
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:58
+msgid "Auto zoom: "
+msgstr "Автомасштабування: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
+msgid "Autoload Tiles: "
+msgstr "Автозавантаження квадратів: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
+msgid "Min zoom lvl: "
+msgstr "Мін. рівень масштабування: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:70
+msgid "Max zoom lvl: "
+msgstr "Макс. рівень масштабування: "
+
+#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:74
+msgid "Fade background: "
+msgstr "Блякле тло: "
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
+msgid "AutoSave LiveData"
+msgstr "Автозбереження редагованих даних"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:38
+msgid "Save captured data to file every minute."
+msgstr "Зберігати захоплені дані в файл кожну хвилину."
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:65
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:81
+#, java-format
+msgid "Error while exporting {0}: {1}"
+msgstr "Помилка під час експорту {0}: {1}"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:51
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:179
+msgid "Way: "
+msgstr "Лінія: "
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java:107
+msgid "Duplicate hotkey for button '{0}' - button will be ignored!"
+msgstr ""
+"Дублювання комбінації клавіш для кнопки '{0}' — кнопка буде проігнорована!"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorPlugin.java:40
+msgid "SurveyorPlugin needs LiveGpsPlugin, but could not find it!"
+msgstr ""
+"Втулку SurveyorPlugin потрібен втулок LiveGpsPlugin, але його не знайдено!"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
+msgid "Surveyor..."
+msgstr "Землемір…"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
+msgid "Open surveyor tool."
+msgstr "Відкрити Землемір."
+
+#. surveyorFrame.setTitle((String)getValue(AbstractAction.NAME));
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:110
+msgid "Surveyor"
+msgstr "Землемір"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:139
+#, java-format
+msgid "Could not read surveyor definition: {0}"
+msgstr "Не вдалося прочитати визначення землеміра: {0}"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
+#, java-format
+msgid "Error parsing {0}: {1}"
+msgstr "Помилка при розборі {0}: {1}"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:40
+msgid "Surveyor waypoint layer"
+msgstr "Інспектор шару точок шляху"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:61
+#, java-format
+msgid "{0} start"
+msgstr "{0} початок"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:63
+#, java-format
+msgid "{0} end"
+msgstr "{0} кінець"
+
+#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java:72
+msgid "Waypoint Description"
+msgstr "Опис точки шляху"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:25
+msgid "Edit tags"
+msgstr "Правити теґи"
+
+#. TODO: set "tag-editor" and add /images/tag-editor.png to distrib
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:27
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:30
+msgid "Launches the tag editor dialog"
+msgstr "Відкриває діалог редактора теґів"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:149
+msgid "JOSM Tag Editor Plugin"
+msgstr "Втулок JOSM для редагування теґів"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:290
+msgid "Abort tag editing and close dialog"
+msgstr "Перервати редагування теґів і закрити діалог"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:303
+msgid "Apply edited tags and close dialog"
+msgstr "Застосувати виправлені теґи і закрити діалог"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
+msgid "Highlight"
+msgstr "Підсвічування"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:169
+#, java-format
+msgid "Updating properties of up to {0} object"
+msgid_plural "Updating properties of up to {0} objects"
+msgstr[0] "Оновлення властивостей {0} об’єкта"
+msgstr[1] "Оновлення властивостей {0} об’єктів"
+msgstr[2] "Оновлення властивостей {0} об’єктів"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
+msgid "Group"
+msgstr "Група"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
+msgid "Item"
+msgstr "Елемент"
+
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:58
+msgid "Clear"
+msgstr "Очистити"
+
+#. should not happen
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableModel.java:82
+#, java-format
+msgid "unexpected column number {0}"
+msgstr "несподіваний номер стовпця {0}"
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
+msgid "Tagging Preset Tester"
+msgstr "Аналізатор заготовок теґів"
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
+msgid ""
+"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgstr ""
+"Відкрийте засіб аналізу заготовок теґів, щоб скористатися діалогом перегляду "
+"цих теґів."
+
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
+msgid "You have to specify tagging preset sources in the preferences first."
+msgstr ""
+"У першу чергу ви повинні вказати в налаштуваннях джерела заготовок теґів."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:66
+msgid "Enter housenumbers or amount of segments"
+msgstr "Введіть номери будинків чи кількість сегментів"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:93
+msgid "Terrace a house"
+msgstr "Пронумерувати будинок"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:158
+msgid "Interpolation"
+msgstr "Інтерполяція"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:160
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:120
+msgid "Segments"
+msgstr "Сегменти"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:162
+msgid "Street"
+msgstr "Вулиця"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:164
+msgid "Lowest Number"
+msgstr "Найменший номер"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:166
+msgid "Lowest housenumber of the terraced house"
+msgstr "Найменший номер для ряду будинків"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:168
+msgid "Highest Number"
+msgstr "Найбільший номер"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+msgid "add to existing associatedStreet relation"
+msgstr "додати до існуючого зв’язку associatedStreet"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+msgid "create an associatedStreet relation"
+msgstr "створити зв’язок associatedStreet"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:172
+msgid "delete outline way"
+msgstr "вилучити лінію контуру"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:192
+msgid "Street name: "
+msgstr "Назва вулиці: "
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:275
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:279
+msgid "Even/Odd"
+msgstr "Парні/Непарні"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:113
+msgid "Lowest number"
+msgstr "Найменший номер"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:117
+msgid "Highest number"
+msgstr "Найбільший номер"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:159
+msgid "Lowest housenumber cannot be higher than highest housenumber"
+msgstr "Найменший номер не може бути більшим за найбільший"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:186
+msgid "Housenumbers do not match odd/even setting"
+msgstr "Номери будинків не відповідають налаштуванням парні/непарні"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:211
+msgid "Segment must be a number greater 1"
+msgstr "Сегмент повинен бути цілим числом більше 1"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:235
+#, java-format
+msgid "{0} must be greater than 0"
+msgstr "{0} повинно бути більше, ніж 0"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:240
+#, java-format
+msgid "{0} is not a number"
+msgstr "{0} не є числом"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
+msgid "Reverse a terrace"
+msgstr "Зворотній ряд будинків по вулиці"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
+msgid "Reverses house numbers on a terrace."
+msgstr "Обернути номери будинків по вулиці."
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+msgid "Reverse a Terrace"
+msgstr "Зворотній ряд будинків по вулиці"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr "Не можливо обернути!"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
+msgid "Reverse Terrace"
+msgstr "Зворотній ряд будинків по вулиці"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
+#: ../plugins/terracer/src/terracer/TerracerAction.java:67
+msgid "Terrace a building"
+msgstr "Ряд будинків по вулиці"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:65
+msgid "Creates individual buildings from a long building."
+msgstr "Створити окремі будівлі з довгої будівлі"
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:127
+msgid "Select a single, closed way of at least four nodes."
+msgstr "Виберіть одну замкнену лінію, яка містить, не менше чотирьох точок."
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:286
+msgid "Terrace"
+msgstr "Ряд будинків по вулиці"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/ConnectWays.java:82
+msgid "Merge objects nodes"
+msgstr "Об'єднати точки об'єктів"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
+msgid "Tracer"
+msgstr "Трасувальник"
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
+msgid "Tracer."
+msgstr "Трасувальник."
+
+#: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136
+msgid "Tracer building"
+msgstr "Трасувальник будівлі"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:43
+#, java-format
+msgid ""
+"Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
+"behind shortcut ''{1}'' by action ''{2}''"
+msgstr ""
+"Попередження: втулок turnrestrictions замінює вже існуючу дію ''{0}'', яка "
+"викликається комбінацією ''{1}'', діїєй ''{2}''"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:67
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:111
+#, java-format
+msgid ""
+"Warning: illegal value ''{0}'' for preference key ''{1}''. Falling back to "
+"default value ''shift ctrl T''."
+msgstr ""
+"Попередження: невірне значення ''{0}'' для обраної клавіші ''{1}''. "
+"Повертаємось до типового значення ''shift ctrl T''."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90
+msgid "Create/Edit turn restriction..."
+msgstr "Створити/редагувати обмеження на поворот…"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92
+msgid "Create or edit a turn restriction."
+msgstr "Створити або редагувати обмеження на поворот."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:42
+msgid ""
+"In the following table you can edit the <strong>raw tags</strong> of the OSM "
+"relation representing this turn restriction."
+msgstr ""
+"В наступній таблиці ви можете редагувати <strong>необроблені теґи</strong> "
+"зв’язків OSM, що встановлюють обмеження на поворот."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
+msgid ""
+"In the following table you can edit the <strong>raw members</strong> of the "
+"OSM relation representing this turn restriction."
+msgstr ""
+"В наступній таблиці ви можете редагувати <strong>необроблених членів</"
+"strong> зв’язків OSM, що встановлюють обмеження на поворот."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+msgid "Type:"
+msgstr "Тип:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr "Від:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr "До:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr "Через:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
+msgid "Copy to the clipboard"
+msgstr "Копіювати у буфер обміну"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:423
+#, java-format
+msgid "Cannot find object with id ''{0}'' in layer ''{1}''"
+msgstr "Неможливо знайти об’єкт з id ''{0}'' на шарі ''{1}''"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:426
+#, java-format
+msgid ""
+"Cannot add object ''{0}'' as relation member because it is deleted or "
+"invisible in layer ''{1}''"
+msgstr ""
+"Неможливо додати об’єкт ''{0}'' в якості члена зв’язку, тому що він є "
+"вилученим або невидимим в шарі ''{1}''"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:102
+msgid "Clear the selected roles or delete the selected members"
+msgstr "Очистити вибрані ролі або вилучити виділених  членів"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:128
+msgid "Insert new relation members from object in the clipboard"
+msgstr "Вставити нових членів зв’язку з об’єктів у буфері обміну"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:167
+msgid "Move the selected relation members down by one position"
+msgstr "Пересунути виділених членів зв’язку вниз на одну позицію"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:194
+msgid "Move the selected relation members up by one position"
+msgstr "Пересунути виділених членів зв’язку вгору на одну позицію"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134
+msgid "Edit basic attributes of a turn restriction"
+msgstr "Правити основні атрибути обмеження на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
+msgid "Edit the raw tags and members of this turn restriction"
+msgstr "Правити необроблені теґи та членів цього обмеження на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:141
+msgid "Errors/Warnings"
+msgstr "Помилки/Попередження"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:142
+msgid "Show errors and warnings related to this turn restriction"
+msgstr "Показати помилки та попередження, пов'язані з цим обмеження на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:280
+#, java-format
+msgid "Create a new turn restriction in layer ''{0}''"
+msgstr "Створити нове обмеження на поворот в шарі ''{0}''"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:282
+#, java-format
+msgid "Edit a new turn restriction in layer ''{0}''"
+msgstr "Правити нове обмеження на поворот в шарі ''{0}''"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:284
+#, java-format
+msgid "Edit turn restriction ''{0}'' in layer ''{1}''"
+msgstr "Правити обмеження на поворот ''{0}'' в шарі ''{1}''"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:398
+#, java-format
+msgid ""
+"There is still an unresolved error or warning identified for this turn "
+"restriction. You are recommended to resolve this issue first."
+msgid_plural ""
+"There are still {0} errors and/or warnings identified for this turn "
+"restriction. You are recommended to resolve these issues first."
+msgstr[0] ""
+"Існує нерозв’язана помилка чи попередження для цього обмеження на поворот. "
+"Рекомендується спочатку розв’язати цю проблему."
+msgstr[1] ""
+"Існують {0} нерозв’язані помилки чи попередження для цього обмеження на "
+"поворот. Рекомендується спочатку розв’язати цю проблему."
+msgstr[2] ""
+"Існують {0} нерозв’язаних помилок чи попереджень для цього обмеження на "
+"поворот. Рекомендується спочатку розв’язати цю проблему."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:406
+msgid "Do you want to save anyway?"
+msgstr "Бажаєте зберегти в будь-якому випадку?"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:409
+msgid "Yes, save anyway"
+msgstr "Так, все одно зберегти"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411
+msgid "Save the turn restriction despite of errors and/or warnings"
+msgstr ""
+"Зберегти обмеження на поворот, незважаючи на помилки та/або попередження"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415
+msgid "No, resolve issues first"
+msgstr "Ні, спочатку розв’язати проблеми"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:417
+msgid "Cancel saving and start resolving pending issues first"
+msgstr "Відмінити збереження і спочатку розв’язати не вирішені проблеми"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:425
+msgid "Pending errors and warnings"
+msgstr "Невирішені помилки та попередження"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:484
+#, java-format
+msgid ""
+"This turn restriction refers to an object which was deleted outside of this "
+"turn restriction editor:"
+msgid_plural ""
+"This turn restriction refers to {0} which were deleted outside of this turn "
+"restriction editor:"
+msgstr[0] ""
+"Це обмеження на поворот відноситься до об'єкта, який був вилучений за межами "
+"цього редактора обмеження на поворот:"
+msgstr[1] ""
+"Це обмеження на поворот відноситься до {0} об'єктів, які були вилучені за "
+"межами цього редактора обмеження на поворот:"
+msgstr[2] ""
+"Це обмеження на поворот відноситься до {0} об'єктів, які були вилучені за "
+"межами цього редактора обмеження на поворот:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:497
+msgid ""
+"Updates to this turn restriction can''t be saved unless deleted members are "
+"removed.<br>How to you want to proceed?"
+msgstr ""
+"Оновлення в цьому обмеженні на поворот не можуть бути збережені, поки "
+"вилучені члени не будуть прибрані.<br>Як ви хочете продовжити"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:502
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:504
+msgid "Remove deleted members and save"
+msgstr "Пибрати вилучених членів і зберегти"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:508
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:510
+msgid "Cancel and return to editor"
+msgstr "Скасувати і повернутися у редактор"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:518
+msgid "Deleted members in turn restriction"
+msgstr "Вилучені члени в обмежені на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:597
+msgid "Create a conflict and close this turn restriction editor"
+msgstr "Створити конфлікт і закрити редактор обмежень на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:603
+msgid "Return to the turn restriction editor and resume editing"
+msgstr "Повернутись в редактор обмежень повороту та продовжити редагування"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:610
+msgid ""
+"<html>This turn restriction has been changed outside of the editor.<br>You "
+"cannot apply your changes and continue editing.<br><br>Do you want to create "
+"a conflict and close the editor?</html>"
+msgstr ""
+"<html>Це обмеження повороту було змінено за межами редактора.<br>Ви не "
+"можете застосувати зміни та продовжити редагування.<br><br>Бажаєте створити "
+"конфлікт і закрити редактор?</html>"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
+#, java-format
+msgid ""
+"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
+"resolve this conflict first, then try again.</html>"
+msgstr ""
+"<html>В шарі ''{0}'' вже є конфлікт для об’єкта <br>''{1}''.<br>Будь ласка, "
+"спочатку розв’яжіть цей конфлікт, а потім спробуйте знову..</html>"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
+msgid "Already participating in a conflict"
+msgstr "Вже беруть участь в конфлікті"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+msgid "Delete this turn restriction"
+msgstr "Вилучити це обмеження повороту"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr "Вибрати це обмеження повороту"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr ""
+"Активувати шар до якого відноситься це обмеження повороту та збільшити до "
+"нього"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
+#, java-format
+msgid "{0} warning"
+msgid_plural "{0} warnings"
+msgstr[0] "{0} попередження"
+msgstr[1] "{0} попередження"
+msgstr[2] "{0} попереджень"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:847
+#, java-format
+msgid "{0} error"
+msgid_plural "{0} errors"
+msgstr[0] "{0} помилка"
+msgstr[1] "{0} помилки"
+msgstr[2] "{0} помилок"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:860
+msgid "no issues"
+msgstr "проблем немає"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:147
+msgid "please select a way"
+msgstr "будь ласка, виділіть лінію"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:158
+#, java-format
+msgid "multiple objects with role ''{0}''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245
+msgid "Delete from turn restriction"
+msgstr "Вилучити з обмеження на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:354
+msgid "Paste from the clipboard"
+msgstr "Вставити з буфера обміну"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:220
+msgid "Create new turn restriction"
+msgstr "Створити нове обмеження на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:221
+msgid "Launch the turn restriction editor to create a new turn restriction"
+msgstr ""
+"Запустити редактор обмеження на поворот, щоб створити нове обмеження на "
+"поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:11
+msgid "No Right Turn"
+msgstr "Поворот праворуч заборонений"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:12
+msgid "No Left Turn"
+msgstr "Поворот ліворуч заборонений"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:13
+msgid "No U-Turn"
+msgstr "Розворот заборонено"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:14
+msgid "No Straight On"
+msgstr "Рух прямо заборонений"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:15
+msgid "Only Right Turn"
+msgstr "Тільки праворуч"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:16
+msgid "Only Left Turn"
+msgstr "Тільки ліворуч"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:17
+msgid "Only Straight On"
+msgstr "Тільки прямо"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:34
+#, java-format
+msgid "Warning: failed to load icon for turn restriction type ''{0}''"
+msgstr ""
+"Попередження: неможливо завантажити піктограму для обмеження на поворот, "
+"типу ''{0}''"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75
+msgid "please select a turn restriction type"
+msgstr "будь ласка, оберіть тип обмеження повороту"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:59
+msgid ""
+"Select the vehicle types this turn restriction is <strong>not</strong> "
+"applicable for."
+msgstr ""
+"Оберіть тип транспортних засобів на які <strong>не</strong> не "
+"розповсюджується це обмеження повороту."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
+msgid "Public Service Vehicles"
+msgstr "Громадський транспорт"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:83
+msgid "Public service vehicles like buses, tramways, etc."
+msgstr "Громадський транспорт: автобуси, трамваї, тощо"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:95
+msgid "Heavy Goods Vehicles"
+msgstr "Вантажівки"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:108
+msgid "Motorcars"
+msgstr "Механічні транспортні засоби"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:122
+msgid "Bicycles"
+msgstr "Велосипеди"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:193
+msgid "Use standard exceptions"
+msgstr "Використовувати стандартні винятки"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:203
+msgid "Use non-standard exceptions"
+msgstr "Використовувати нестандартні винятки"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:156
+msgid "Remove the currently selected vias"
+msgstr "Вилучити вибрані проміжні пункти"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177
+msgid "Move the selected vias down by one position"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:203
+msgid "Move the selected vias up by one position"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:231
+msgid "Copy the selected vias to the clipboard"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:264
+msgid "Insert 'via' objects from the clipboard"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java:177
+#, java-format
+msgid ""
+"Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
+"''via''."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:125
+msgctxt "turnrestrictions"
+msgid "From:"
+msgstr "З:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:136
+msgctxt "turnrestriction"
+msgid "To:"
+msgstr "До:"
+
+#. FIXME: render as warning/error (red background?)
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:173
+msgid "no participating way with role ''from''"
+msgstr ""
+
+#. FIXME: render as warning/error (red background?)
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:183
+msgid "no participating way with role ''to''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:104
+msgid "Only participating in selection"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:106
+msgid ""
+"<html>Select to display turn restrictions related to object in the current "
+"selection only.<br>Deselect to display all turn restrictions in the current "
+"data set.</html>"
+msgstr ""
+"<html>Виберіть, щоб показати лише ті обмеження поворотів, які відносяться до "
+"виділених об'єктів.<br>Скасуйте вибір, щоб показати всі обмеження поворотів "
+"в поточному наборі даних.</html>"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:162
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:107
+msgid "Turn Restrictions"
+msgstr "Обмеження поворотів"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:164
+msgid "Display and manage turn restrictions in the current data set"
+msgstr ""
+"Відображення та керування обмеженнями повороту у поточному наборі даних"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
+msgid "Open an editor for the selected turn restricion"
+msgstr "Відкрити редактор для обраного обмеження повороту"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
+msgid "Delete the selected turn restriction"
+msgstr "Вилучити обмеження повороту"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:314
+msgid "Create a new turn restriction"
+msgstr "Створити обмеження повороту"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:353
+msgid "Set the current JOSM selection to the selected turn restrictions"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:355
+msgid "Select in current data layer"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:386
+msgid "Zoom to the currently selected turn restrictions"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
+msgid ""
+"Development of the turn restriction plugin was sponsored by <a href=\"http://"
+"www.skobbler.de\">skobbler GmbH</a>."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
+msgid "Configure the preferences for the turnrestrictions plugin"
+msgstr "Змінити налаштування втулка обмежень повороту"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:97
+msgid "Sponsor"
+msgstr "Спонсор"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:106
+msgid "An OSM plugin for editing turn restrictions."
+msgstr "Втулок OSM для редагування обмежень повороту."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:50
+msgid ""
+"The Basic Editor can optionally display the list of via-objects of a turn "
+"restriction. If enabled, one can edit them in the Basic editor too. If "
+"disabled, editing of via-objects is possible in the Advanced Editor only."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
+msgid "Display and edit list of via-objects in the Basic Editor"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
+msgid "Road signs - Set A"
+msgstr "Дорожні знаки — набір A"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:107
+msgid "Road signs - Set B"
+msgstr "Дорожні знаки — набір Б"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:131
+msgid "Please select the set of road sign icons to be used in the plugin."
+msgstr ""
+"Будь ласка оберіть набір піктограм дорожніх знаків, що буде "
+"використовуватись втулком"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:188
+#, java-format
+msgid ""
+"Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
+"Assuming the default value ''set-a''."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:48
+msgid ""
+"Please configure the <strong>keyboard shortcut</strong> which triggers "
+"creating/editing a turn restriction from the current JOSM selection."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64
+msgctxt "keyboard-key"
+msgid "Key:"
+msgstr "Клавіша:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:75
+msgctxt "keyboard-modifiers"
+msgid "Modifiers:"
+msgstr "Модифікатори:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:78
+msgctxt "keyboard-modifiers"
+msgid "Shift"
+msgstr "Клавіша \"Shift\""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:80
+msgctxt "keyboard-modifiers"
+msgid "Ctrl"
+msgstr "Клавіша \"Ctrl\""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:82
+msgctxt "keyboard-modifiers"
+msgid "Alt"
+msgstr "Клавіша \"Alt\""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:85
+msgctxt "keyboard-modifiers"
+msgid "Meta"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:29
+#, java-format
+msgid ""
+"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
+"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
+"a turn restriction, the way with role <tt>from</tt> should be different from "
+"the way with role <tt>to</tt>, though."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
+msgid "Delete ''from''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:38
+msgid "Removes the member with role ''from''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:47
+msgid "Delete ''to''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:48
+msgid "Removes the member with role ''to''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:57
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:35
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:59
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:30
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:56
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:33
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:80
+msgid "Fix in editor"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:58
+msgid ""
+"Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27
+#, java-format
+msgid ""
+"This turn restriction uses a non-standard restriction type <tt>{0}</tt> for "
+"the tag key <tt>restriction</tt>. It is recommended to use standard values "
+"only. Please select one in the Basic editor."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:36
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:31
+msgid "Go to Basic Editor and manually choose a turn restriction type"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37
+#, java-format
+msgid ""
+"The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
+"<strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at "
+"node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">"
+"{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to "
+"set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-"
+"object."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
+msgid "Set via-Object"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:50
+msgid ""
+"Replaces the currently configured via-objects with the node at the "
+"intersection"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
+msgid "Go to Basic Editor and manually fix the list of via-objects"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
+msgid ""
+"A turn restriction must declare the type of restriction. Please select a "
+"type in the Basic Editor."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
+msgid "An OSM way with role <tt>from</tt> is required in a turn restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
+msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
+msgid "Please go to the Basic editor and manually choose an OSM way."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
+msgid "Add in editor"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
+msgid "Add an OSM way with role ''from''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54
+msgid "Add an OSM way with role ''to''"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
+#, java-format
+msgid ""
+"A turn restriction requires exactly one way with role <tt>from</tt>. This "
+"turn restriction has {0} ways in this role. Please remove {1} of them."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
+#, java-format
+msgid ""
+"A turn restriction requires exactly one way with role <tt>to</tt>. This turn "
+"restriction has {0} ways in this role. Please remove {1} of them."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
+msgid "Go to the Advanced Editor and remove the members"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25
+#, java-format
+msgid ""
+"The tag <tt>except</tt> has the non-standard value <tt>{0}</tt>. It is "
+"recommended to use standard values for <tt>except</tt> only."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:34
+msgid "Go to Basic Editor and select standard vehicle type based exceptions"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37
+#, java-format
+msgid "The required tag <tt>{0}={1}</tt> is missing."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
+msgid "Add missing tag"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46
+#, java-format
+msgid "Add the missing tag {0}={1}"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
+#, java-format
+msgid ""
+"The OSM way <span class=\"object-name\">{0}</span> with role <tt>{1}</tt> "
+"should be split at node <span class=\"object-name\">{2}</span> where it "
+"connects to way <span class=\"object-name\">{3}</span>."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
+msgid "Split now"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
+msgid "Splits the way"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:45
+#, java-format
+msgid ""
+"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
+#, java-format
+msgid ""
+"This turn restriction uses the OSM relation <span class=\"object-name\">{0}</"
+"span> as member with role <tt>{1}</tt>."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
+msgid "An OSM way is required instead."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63
+msgid "Delete the member from the turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81
+msgid "Change to the Basic Editor and select an OSM way"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
+msgid "Undelete object..."
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
+msgid "Undelete object by id"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
+msgid "Select if the data should be added into a new layer"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
+msgid "Enter the ID of the object that should be undeleted"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
+msgid "Undelete Object"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
+msgid "Undelete object"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
+msgid "Start undeleting"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
+msgid "Close dialog and cancel"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
+#, java-format
+msgid "Will get {0}"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
+#, java-format
+msgid "Looking for {0}"
+msgstr ""
+
+#: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
+#, java-format
+msgid "Found {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:99
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:84
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
+msgid "Validation errors"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
+msgid "No validation errors"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169
+msgid "Grid"
+msgstr "Сітка"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
+#, java-format
+msgid ""
+"Error initializing test {0}:\n"
+" {1}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
+msgid "Use ignore list."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:75
+msgid "Use the ignore list to suppress warnings."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
+msgid "Use error layer."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:79
+msgid "Use the error layer to display problematic elements."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
+msgid "Show informational level on upload."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:83
+msgid "Show the informational tests in the upload check windows."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
+msgid "On demand"
+msgstr "На вимогу"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:89
+msgid "On upload"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
+msgid ""
+"An OSM data validator that checks for common errors made by users and editor "
+"programs."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:101
+msgid "Data validator"
+msgstr ""
+
+#. * Error messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:14
+msgid "Errors"
+msgstr "Помилки"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:14
+msgid "validation error"
+msgstr ""
+
+#. * Warning messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:16
+msgid "Warnings"
+msgstr "Попередження"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:16
+msgid "validation warning"
+msgstr ""
+
+#. * Other messages
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
+msgid "Other"
+msgstr "Інше"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:18
+msgid "validation other"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java:102
+#, java-format
+msgid "Running test {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:46
+msgid "Validation"
+msgstr "Перевірка"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
+msgid "Performs the data validation"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:121
+msgid "Validating"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:162
+#, java-format
+msgid "Test {0}/{1}: Starting {2}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:171
+msgid "Updating ignored errors ..."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:118
+msgid "Data with errors. Upload anyway?"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:84
+msgid "Open the validation window."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:91
+msgid "Zoom to problem"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:112
+msgid "Fix"
+msgstr "Виправити"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:112
+msgid "Fix the selected errors."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:117
+msgid "Ignore the selected errors next time."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
+msgid "Whole group"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
+msgid "Single elements"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:198
+msgid "Nothing"
+msgstr "Нічого"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:199
+msgid "Ignore whole group or individual elements?"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:200
+msgid "Ignoring elements"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:465
+msgid "Fixing errors ..."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:488
+#, java-format
+msgid "Fixing ({0}/{1}): ''{2}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:504
+msgid "Updating map ..."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:70
+#, java-format
+msgid "Replace \"{0}\" by \"{1}\" for"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:76
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:66
+msgid "object"
+msgid_plural "objects"
+msgstr[0] "об'єкт"
+msgstr[1] "об'єкти"
+msgstr[2] "об'єктів"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
+msgid "Coastlines."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:43
+msgid "This test checks that coastlines are correct."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:121
+msgid "Unconnected coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:151
+msgid "Unordered coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:155
+msgid "Reversed coastline"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
+msgid "Crossing ways."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:48
+msgid ""
+"This test checks if two roads, railways, waterways or buildings crosses in "
+"the same layer, but are not connected by a node."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
+msgid "Crossing buildings"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
+msgid "Crossing ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:79
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:125
+msgid "Duplicated nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:80
+msgid "This test checks that there are no nodes at the very same location."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:146
+msgid "Nodes at same position"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:64
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:84
+msgid "Duplicated ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:65
+msgid ""
+"This test checks that there are no ways with same tags and same node "
+"coordinates."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:169
+msgid "Delete duplicate ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
+msgid "Duplicated way nodes."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:24
+msgid "Checks for ways with identical consecutive nodes."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:37
+msgid "Duplicated way nodes"
+msgstr ""
+
+#. group "Relations"
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
+#: build/trans_presets.java:3180
+msgid "Multipolygon"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:37
+msgid "This test checks if multipolygons are valid"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:105
+msgid "No outer way for multipolygon"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:118
+msgid "Multipolygon is not closed"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:140
+msgid "Multipolygon inner way is outside."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:143
+msgid "Intersection between multipolygon ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:154
+msgid "No useful role for multipolygon member"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:157
+msgid "Non-Way in multipolygon."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
+msgid "Missing name:* translation."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:37
+msgid ""
+"This test finds multilingual objects whose 'name' attribute is not equal to "
+"some 'name:*' attribute and not a composition of 'name:*' attributes, e.g., "
+"Italia - Italien - Italy."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:47
+msgid "A name:* translation is missing."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:74
+msgid "A name is missing, even though name:* exists."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:25
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:63
+msgid "Nodes with same name"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:26
+msgid "This test finds nodes that have the same name (might be duplicates)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
+msgid "Overlapping ways."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:45
+msgid ""
+"This test checks that a connection between two nodes is not used by more "
+"than one way."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:108
+msgid "Overlapping areas"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:113
+msgid "Overlapping highways (with area)"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:118
+msgid "Overlapping railways (with area)"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:123
+msgid "Overlapping ways (with area)"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:129
+msgid "Overlapping highways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:134
+msgid "Overlapping railways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:139
+msgid "Overlapping ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:22
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:34
+msgid "Self-intersecting ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:23
+msgid ""
+"This test checks for ways that contain some of their nodes more than once."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:39
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:87
+msgid "Similarly named ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:40
+msgid ""
+"This test checks for ways with similar names that may have been misspelled."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:153
+msgid "Properties checker :"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:154
+msgid "This plugin checks for errors in property keys and values."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:286
+#, java-format
+msgid "Invalid tagchecker line - {0}: {1}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:299
+#, java-format
+msgid "Invalid spellcheck line: {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:310
+#, java-format
+msgid ""
+"Could not access data file(s):\n"
+"{0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:435
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:436
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:446
+msgid "Illegal tag/value combinations"
+msgstr ""
+
+#. passing translated text also to original string, as we already
+#. translated the stuff before. Makes the ignore file language dependend.
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:461
+msgid "Painting problem"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:471
+#, java-format
+msgid "Key ''{0}'' invalid."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:476
+msgid "Tags with empty values"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:482
+msgid "Invalid property key"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:488
+msgid "Invalid white space in property key"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:494
+msgid "Property values start or end with white space"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:500
+msgid "Property values contain HTML entity"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:527
+#, java-format
+msgid "Key ''{0}'' not in presets."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:528
+msgid "Presets do not contain property key"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:550
+#, java-format
+msgid "Value ''{0}'' for key ''{1}'' not in presets."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:551
+msgid "Presets do not contain property value"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:563
+msgid "FIXMES"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:610
+msgid "Check property keys."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+msgid "Validate that property keys are valid checking against list of words."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:618
+msgid "Use complex property checker."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:619
+msgid "Validate property values and tags using complex rules."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:640
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:641
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:663
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:679
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:680
+msgid "TagChecker source"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703
+msgid ""
+"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
+"org/index.php/User:JLS/speller) or tag checking data files."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
+msgid "Add a new source to the list."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:705
+msgid "Edit the selected source."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:706
+msgid "Delete the selected source from the list."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:708
+msgid "Data sources"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
+msgid "Check property values."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+msgid "Validate that property values are valid checking against presets."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:736
+msgid "Check for FIXMES."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+msgid "Looks for nodes or ways with FIXME in any property value."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:744
+msgid "Check for paint notes."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+msgid "Check if map painting found data errors."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
+msgid "Use default data file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+msgid "Use the default data file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
+msgid "Use default tag ignore file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
+msgid "Use the default tag ignore file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:760
+msgid "Use default spellcheck file."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:761
+msgid "Use the default spellcheck file (recommended)."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:855
+msgid "Fix properties"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:970
+msgid "Could not find element type"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
+msgid "Incorrect number of parameters"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990
+msgid "Could not find warning level"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#, java-format
+msgid "Illegal expression ''{0}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1003
+#, java-format
+msgid "Illegal regular expression ''{0}''"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
+msgid "Unclosed Ways."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:35
+msgid "This tests if ways which should be circular are closed."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:77
+#, java-format
+msgid "natural type {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:80
+#, java-format
+msgid "landuse type {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:83
+#, java-format
+msgid "amenities type {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:86
+#, java-format
+msgid "sport type {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:89
+#, java-format
+msgid "tourism type {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:92
+#, java-format
+msgid "shop type {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:95
+#, java-format
+msgid "leisure type {0}"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:98
+#, java-format
+msgid "waterway type {0}"
+msgstr ""
+
+#. color building
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="area" b="yes"/>
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:104
+#: build/trans_style.java:4299
+msgid "area"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:123
+msgid "Unclosed way"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61
+msgid "Unconnected ways."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:62
+msgid "This test checks if a way has an endpoint very near to another way."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:127
+msgid "Way end node near other highway"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:147
+msgid "Way end node near other way"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:168
+msgid "Way node near other way"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:186
+msgid "Connected way end node near other way"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:37
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:70
+msgid "Untagged and unconnected nodes"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38
+msgid "This test checks for untagged nodes that are not part of any way."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:60
+msgid "Untagged, empty and one node ways."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:61
+msgid "This test checks for untagged, empty and one node ways."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
+msgid "Unnamed ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:94
+msgid "Unnamed junction"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:101
+msgid "Untagged ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:106
+msgid "Empty ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:110
+msgid "One node ways"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:35
+msgid "Wrongly Ordered Ways."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:36
+msgid "This test checks the direction of water, land and coastline ways."
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:70
+msgid "Reversed coastline: land not on left side"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:75
+msgid "Reversed water: land not on left side"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:80
+msgid "Reversed land: land not on left side"
+msgstr ""
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/MultipleNameVisitor.java:75
+#, java-format
+msgid "{0}, ..."
+msgstr "{0}, …"
+
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "Відео"
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
+msgid "Scanned Map..."
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
+msgid ""
+"Display a map that was previously scanned and uploaded to walking-papers.org"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
+msgid ""
+"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
+#, java-format
+msgid "Could not read information from walking-papers.org the id \"{0}\""
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:61
+#, java-format
+msgid "Walking Papers: {0}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java:364
+#, java-format
+msgid "Walking Papers layer ({0}) in zoom {1}"
+msgstr ""
+
+#: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersPlugin.java:30
+msgid "Walking Papers"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:56
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:59
+msgid "Way Download"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:58
+msgid "Download map data on the end of selected way"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:100
+msgid ""
+"<html>Neither a node nor a way with an endpoint outside of the<br>current "
+"download areas is selected.<br>Select a node on the start or end of a way or "
+"an entire way first.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:107
+msgid "<html>Could not find a unique node to start downloading from.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:119
+#, java-format
+msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
+#, java-format
+msgid ""
+"Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t "
+"discovered after download"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:183
+#, java-format
+msgid ""
+"<html>There aren''t further connected ways to download.<br>A potential "
+"duplicate node of the currently selected node was found, though.<br><br>The "
+"currently selected node is ''{0}''<br>The potential duplicate node is "
+"''{1}''<br>Merge the duplicate node onto the currently selected node and "
+"continue way downloading?</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
+msgid "Merge duplicate node?"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:213
+msgid "<html>No more connected ways to download.</html>"
+msgstr ""
+
+#: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:222
+#, java-format
+msgid "Node ''{0}'' is a junction with more than 2 connected ways."
+msgstr ""
+
+#: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:44
+#: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:47
+msgid "Way Select"
+msgstr ""
+
+#: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:46
+msgid "Select non-branching sequences of ways"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
+msgid "Exception occurred"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
+msgid "Not in cache"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
+msgid "Rectified Image..."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:69
+msgid "Download Rectified Images From Various Services"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:71
+#, java-format
+msgid "WMS: {0}"
+msgstr ""
+
+#. This service serves the purpose of "just this once" without forcing the user
+#. to commit the link to the preferences
+#. Clipboard content gets trimmed, so matching whitespace only ensures that this
+#. service will never be selected automatically.
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:107
+msgid "Custom WMS Link"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:112
+msgid "Supported Rectifier Services:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:136
+msgid "Visit Homepage"
+msgstr "Відвідати Домівку"
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:145
+msgid "WMS URL or Image ID:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:149
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
+msgid "Add Rectified Image"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201
+msgid ""
+"Couldn't match the entered link or id to the selected service. Please try "
+"again."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:202
+msgid "No valid WMS URL or id"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
+msgid "Adjust the position of the selected WMS layer"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
+msgid "Please select the WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
+msgid "Select WMS layer"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
+msgid "Start adjusting"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:197
+msgid "There are currently no WMS layer to adjust."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:198
+msgid "No layers to adjust"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSDownloadAction.java:15
+#, java-format
+msgid "Download WMS tile from {0}"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
+#, java-format
+msgid ""
+"Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
+"or a trailing '?'."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
+msgid ""
+"Warning: Fetching WMS tiles is likely to fail. Please check you preference "
+"settings."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:119
+#, java-format
+msgid "Warning: The complete URL is ''{0}''."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:140
+#, java-format
+msgid ""
+"The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+"This may lead to wrong coordinates."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:61
+msgid "Automatic downloading"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:103
+#, java-format
+msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:105
+msgid "(deactivated)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:156
+#, java-format
+msgid "WMS layer ({0}), automatically downloading in zoom {1}"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:158
+#, java-format
+msgid "WMS layer ({0}), downloading in zoom {1}"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
+#, java-format
+msgid ""
+"<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with a "
+"''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS request. "
+"You should check your<br>preference settings.<br>Do you want to fetch WMS "
+"tiles anyway?"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
+msgid "Yes, fetch images"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
+msgid "Invalid URL?"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
+msgid "Change resolution"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
+msgid "Reload erroneous tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
+msgid "Alpha channel"
+msgstr "Альфа-канал"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
+msgid "Save WMS layer to file"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
+msgid "Save WMS layer"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
+msgid "Load WMS layer from file"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
+msgid "Load WMS layer"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
+#, java-format
+msgid "Unsupported WMS file version; found {0}, expected {1}"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
+msgid "File Format Error"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
+msgid "Error loading file"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
+msgid "Set WMS Bookmark"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:174
+msgid "WMS"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:187
+msgid "Open a blank WMS layer to load data from a file"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+msgid "WMS Plugin Preferences"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
+msgid "Modify list of WMS servers displayed in the WMS plugin menu"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
+msgid "Menu Name"
+msgstr "Назва меню"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82
+msgid "WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+msgid "Menu Name (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
+msgid "WMS URL (Default)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:86
+msgid "Enter a menu name and WMS URL"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:110
+msgid "Copy Selected Default(s)"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:118
+msgid "Please select at least one row to copy."
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:162
+msgid "Downloader:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:169
+msgid "Overlap tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:170
+msgid "% of east:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
+msgid "% of north:"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
+#: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
+msgid "WMS Files (*.wms)"
+msgstr ""
+
+#. *
+#. This file can be used to add some special messages to the translation,
+#. which are not part of the programm texts, but should be translated nevertheless.
+#.
+#: build/specialmessages.java:6
+msgid ""
+"You requested too many nodes (limit is 50,000). Either request a smaller "
+"area, or use planet.osm"
+msgstr ""
+
+#. OSM server message
+#: build/specialmessages.java:7
+msgid "Database offline for maintenance"
+msgstr ""
+
+#. OSM server message
+#: build/specialmessages.java:8
+msgid ""
+"The maximum bbox size is 0.25, and your request was too large. Either "
+"request a smaller area, or use planet.osm"
+msgstr ""
+
+#. OSM server message
+#: build/specialmessages.java:9
+msgid "could not get audio input stream from input URL"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:10
+msgid "Audio Device Unavailable"
+msgstr ""
+
+#. Java message loading audio data
+#: build/specialmessages.java:11
+msgid "You must make your edits public to upload new data"
+msgstr ""
+
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "вниз"
+
+#. Plugin AddrInterpolation
+#: build/trans_plugins.java:3
+msgid ""
+"Group common Address Interpolation inputs in a single dialog, as well as an "
+"option to automatically generate individual house number nodes from a Way."
+msgstr ""
+
+#. Plugin buildings_tools
+#: build/trans_plugins.java:5
+msgid "Tools for drawing buildings."
+msgstr ""
+
+#. Plugin cadastre-fr
+#: build/trans_plugins.java:7
+msgid "A special handler for the French land registry WMS server."
+msgstr ""
+
+#. Plugin colorscheme
+#: build/trans_plugins.java:9
+msgid ""
+"Allows the user to create different color schemes and to switch between "
+"them. Just change the colors and create a new scheme. Used to switch to a "
+"white background with matching colors for better visibility in bright "
+"sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but "
+"true :-)"
+msgstr ""
+
+#. Plugin Create_grid_of_ways
+#: build/trans_plugins.java:11
+msgid "Create a grid of ways."
+msgstr ""
+
+#. Plugin czechaddress
+#: build/trans_plugins.java:13
+msgid ""
+"Creating and handling address nodes and buildings within Czech Republic."
+msgstr ""
+
+#. Plugin dataimport
+#: build/trans_plugins.java:15
+msgid "Allows to import various file formats into JOSM directly."
+msgstr ""
+
+#. Plugin DirectUpload
+#: build/trans_plugins.java:17
+msgid ""
+"This plugin directly upload GPS Traces from current active layer in JOSM to "
+"openstreetmap.org."
+msgstr ""
+
+#. Plugin Duplicate-Way
+#: build/trans_plugins.java:19
+msgid "Duplicate Ways with an offset"
+msgstr ""
+
+#. Plugin editgpx
+#: build/trans_plugins.java:21
+msgid ""
+"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
+"very fast."
+msgstr ""
+
+#. Plugin globalsat
+#: build/trans_plugins.java:23
+msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
+msgstr ""
+
+#. Plugin graphview
+#: build/trans_plugins.java:25
+msgid "Visualizes routing information as a routing graph."
+msgstr ""
+
+#. Plugin grid
+#: build/trans_plugins.java:27
+msgid "Provide a background layer that displays a map grid"
+msgstr ""
+
+#. Plugin ImageWayPoint
+#: build/trans_plugins.java:29
+msgid ""
+"Another plugin to match images to the waypoints in a GPX file. A match is "
+"made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
+"the filename of an image."
+msgstr ""
+
+#. Plugin lakewalker
+#: build/trans_plugins.java:31
+msgid "Helps vectorizing WMS images."
+msgstr ""
+
+#. Plugin livegps
+#: build/trans_plugins.java:33
+msgid ""
+"Support live GPS input (moving dot) through a connection to gpsd server."
+msgstr ""
+
+#. Plugin measurement
+#: build/trans_plugins.java:35
+msgid ""
+"Provide a measurement dialog and a layer to measure length and angle of "
+"segments, area surrounded by a (simple) closed way and create measurement "
+"paths (which also can be imported from a gps layer)."
+msgstr ""
+
+#. Plugin michigan_left
+#: build/trans_plugins.java:37
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
+#. Plugin multipoly-convert
+#: build/trans_plugins.java:39
+msgid "Simply convert an area to a multipolygon."
+msgstr ""
+
+#. Plugin multipoly
+#: build/trans_plugins.java:41
+msgid ""
+"Create multipolygons by one click, much easier than standard way with "
+"relation editor."
+msgstr ""
+
+#. Plugin nearclick
+#: build/trans_plugins.java:43
+msgid ""
+"Simulates a click when you do a small and short drag. This is useful for "
+"tablet pens, when you have problems just clicking the tablet without the "
+"mouse moving (general Java - tablet problem)."
+msgstr ""
+
+#. Plugin openlayers
+#: build/trans_plugins.java:45
+msgid "Displays an OpenLayers background image"
+msgstr ""
+
+#. Plugin openstreetbugs
+#: build/trans_plugins.java:47
+msgid "Imports issues from OpenStreetBugs"
+msgstr ""
+
+#. Plugin openvisible
+#: build/trans_plugins.java:49
+msgid ""
+"Allows opening gpx/osm files that intersect the currently visible screen area"
+msgstr ""
+
+#. Plugin osmarender
+#: build/trans_plugins.java:51
+msgid ""
+"Launches FireFox to display the current visible screen as a nice SVG image."
+msgstr ""
+
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:53
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
+#. Plugin PicLayer
+#: build/trans_plugins.java:55
+msgid ""
+"This plugin allows to display any picture as a background in the editor and "
+"align it with the map."
+msgstr ""
+
+#. Plugin plastic_laf
+#: build/trans_plugins.java:57
+msgid "The great JGoodies Plastic Look and Feel."
+msgstr ""
+
+#. Plugin public_transport
+#: build/trans_plugins.java:59
+msgid ""
+"This plugin simplifies the mapping and editing of public transport routes."
+msgstr ""
+
+#. Plugin remotecontrol
+#: build/trans_plugins.java:61
+msgid "Let other applications send commands to JOSM."
+msgstr ""
+
+#. Plugin reverter
+#: build/trans_plugins.java:63
+msgid "Plugin for reverting changesets"
+msgstr ""
+
+#. Plugin routes
+#: build/trans_plugins.java:65
+msgid ""
+"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
+"defined in routes.xml file in plugin directory"
+msgstr ""
+
+#. Plugin routing
+#: build/trans_plugins.java:67
+msgid "Provides routing capabilities."
+msgstr ""
+
+#. Plugin slippymap
+#: build/trans_plugins.java:69
+msgid ""
+"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
+"background and request updates."
+msgstr ""
+
+#. Plugin surveyor
+#: build/trans_plugins.java:71
+msgid "Allow adding markers/nodes on current gps positions."
+msgstr ""
+
+#. Plugin tageditor
+#: build/trans_plugins.java:73
+msgid "Provides a dialog for editing tags in a tabular grid."
+msgstr ""
+
+#. Plugin tagging-preset-tester
+#: build/trans_plugins.java:75
+msgid ""
+"Adds a tagging preset tester to the help menu, which helps you developing of "
+"tagging presets (quick preview of the dialog that will popup). You can start "
+"the jar-file as standalone as well."
+msgstr ""
+
+#. Plugin terracer
+#: build/trans_plugins.java:77
+msgid "Make terraced houses out of single blocks."
+msgstr ""
+
+#. Plugin Tracer
+#: build/trans_plugins.java:79
+msgid ""
+"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
+"to be running."
+msgstr ""
+
+#. Plugin turnrestrictions
+#: build/trans_plugins.java:81
+msgid ""
+"The turnrestrictions plugin allows to enter maintain information about turn "
+"restrictions in the OpenStreetMap database."
+msgstr ""
+
+#. Plugin undelete
+#: build/trans_plugins.java:83
+msgid "Allows undeleting object from OSM database"
+msgstr ""
+
+#. Plugin validator
+#: build/trans_plugins.java:85
+msgid ""
+"An OSM data validator. It checks for problems in data, and provides fixes "
+"for the common ones. Spellcheck integrated for tag names."
+msgstr ""
+
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
+#. Plugin walkingpapers
+#: build/trans_plugins.java:89
+msgid ""
+"Supports downloading tiled, scanned maps from walking-papers.org. This "
+"plugin is still under early development and may be buggy."
+msgstr ""
+
+#. Plugin waydownloader
+#: build/trans_plugins.java:91
+msgid "Easy downloading along a long set of interconnected ways"
+msgstr ""
+
+#. Plugin wayselector
+#: build/trans_plugins.java:93
+msgid "Select a sequence of non-branching connected ways"
+msgstr ""
+
+#. Plugin wms-turbo-challenge2
+#: build/trans_plugins.java:95
+msgid ""
+"Drive a race car from point A to point B over aerial imagery, leave cacti "
+"behind."
+msgstr ""
+
+#. Plugin wmsplugin
+#: build/trans_plugins.java:97
+msgid ""
+"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
+msgstr ""
+
+#. <!--
+#. Pics have been derived from
+#. http://de.wikipedia.org/wiki/Bildtafel_der_Verkehrszeichen_in_Deutschland (german street sign SVGs)
+#. http://commons.wikimedia.org/wiki/Image:National_Park_Service_sample_pictographs.svg (various monochrome pictograms)
+#. http://www.kde.org
+#. http://openclipart.org/media/view/media/clip_art
+#. http://www.sjjb.co.uk/mapicons/ (meanwhile in osm svn)
+#. -->
+#. <!--
+#. item:
+#. name: the text to display
+#. icon: the icon to display
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. type: the data types - way,node,relation,closedway (separated by comma)
+#. link: link to the relating map features website
+#. label: simple static text label
+#. text: the text to display
+#. key: fixed key/value pair to be set
+#. key: key to set
+#. value: value to set
+#. text: text box
+#. key: key to set
+#. text: fixed label to display
+#. default: default string to display
+#. delete_if_empty: true/false
+#. use_last_as_default: true/false
+#. combo: combo box, with multiple choices and possible to enter free form text
+#. key: key to set
+#. text: fixed label to display
+#. values: comma separated list of values
+#. display_values: comma separated list of values to be displayed instead of the
+#. database values, order and number must be equal to values
+#. default: default string to display
+#. delete_if_empty: true/false
+#. check: checkbox
+#. key: key to set
+#. text: fixed label to display
+#. default: ticked on/off
+#. delete_if_empty: true/false
+#. For external files the <annotations> should have following elements:
+#. - author           the author of the preset
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your preset meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. See also http://josm.openstreetmap.de/wiki/TaggingPresets.
+#. The fields "name", "text", "display_values" may also be localized (e.g. de.name).
+#. When translations of equal words but different meanings may conflict, a translation
+#. context should be specified. Use "name_conext", "text_context" or "values_context"
+#. for this. The context should be a meaningful short description to help translators.
+#. In JOSM internally all "name", "text" and "display_values" are translated when
+#. no specific translation has been given in XML file. When no "display_values"
+#. are supplied, then "values" will be treated as "display_values" and translated instead.
+#. -->
+#. <annotations>
+#: build/trans_presets.java:68
+msgid "Highways"
+msgstr ""
+
+#. group "Highways"
+#: build/trans_presets.java:69
+msgid "Streets"
+msgstr "Вулиці"
+
+#. group "Highways/Streets"
+#. <button label="Exit" hotkey="E">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Exit"/>
+#. </button>
+#: build/trans_presets.java:70 build/trans_surveyor.java:72
+msgid "Motorway"
+msgstr "Автомагістраль"
+
+#. item "Highways/Streets/Motorway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
+#: build/trans_presets.java:73
+msgid "Edit Motorway"
+msgstr ""
+
+#. item "Highways/Streets/Motorway" label "Edit Motorway"
+#. <space />
+#. <key key="highway" value="motorway" />
+#. item "Highways/Streets/Trunk" label "Edit Trunk"
+#. <space />
+#. <key key="highway" value="trunk" />
+#. item "Highways/Streets/Trunk Link" label "Edit Trunk Link"
+#. <space />
+#. <key key="highway" value="trunk_link" />
+#. item "Highways/Streets/Primary" label "Edit Primary Road"
+#. <space />
+#. <key key="highway" value="primary" />
+#. item "Highways/Streets/Secondary" label "Edit Secondary Road"
+#. <space />
+#. <key key="highway" value="secondary" />
+#. item "Highways/Streets/Tertiary" label "Edit Tertiary Road"
+#. <space />
+#. <key key="highway" value="tertiary" />
+#. item "Airport/Runway" label "Edit Runway"
+#. <key key="aeroway" value="runway" />
+#. <optional>
+#. item "Airport/Taxiway" label "Edit Taxiway"
+#. <key key="aeroway" value="taxiway" />
+#. <optional>
+#. item "Airport/Helipad" label "Edit Helipad"
+#. <key key="aeroway" value="helipad" />
+#. <optional>
+#. item "Airport/Gate" label "Edit Terminal Gate"
+#. <key key="aeroway" value="gate" />
+#. item "Man Made/Power Station" text "Operator"
+#. item "Relations/Route" text "Name"
+#: build/trans_presets.java:76 build/trans_presets.java:112
+#: build/trans_presets.java:132 build/trans_presets.java:152
+#: build/trans_presets.java:189 build/trans_presets.java:209
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
+msgid "Reference"
+msgstr ""
+
+#. item "Highways/Streets/Motorway" combo "Layer"
+#. item "Highways/Streets/Motorway Link" combo "Layer"
+#. item "Highways/Streets/Trunk" combo "Layer"
+#. item "Highways/Streets/Trunk Link" combo "Layer"
+#. item "Highways/Streets/Primary" combo "Layer"
+#. item "Highways/Streets/Primary Link" combo "Layer"
+#. item "Highways/Streets/Secondary" combo "Layer"
+#. item "Highways/Streets/Roundabout" combo "Layer"
+#: build/trans_presets.java:80 build/trans_presets.java:97
+#: build/trans_presets.java:116 build/trans_presets.java:135
+#: build/trans_presets.java:156 build/trans_presets.java:172
+#: build/trans_presets.java:193 build/trans_presets.java:411
+msgid "Lanes"
+msgstr ""
+
+#. item "Highways/Streets/Motorway" combo "Lanes"
+#. item "Highways/Streets/Motorway Link" combo "Lanes"
+#. item "Highways/Streets/Trunk" combo "Lanes"
+#. item "Highways/Streets/Trunk Link" combo "Lanes"
+#. item "Highways/Streets/Primary" combo "Lanes"
+#. item "Highways/Streets/Primary Link" combo "Lanes"
+#. item "Highways/Streets/Secondary" combo "Lanes"
+#. item "Highways/Streets/Tertiary" combo "Layer"
+#. item "Highways/Streets/Unclassified" combo "Layer"
+#. item "Highways/Streets/Bridge" combo "Layer"
+#. item "Highways/Streets/Tunnel" combo "Layer"
+#. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
+#: build/trans_presets.java:81 build/trans_presets.java:98
+#: build/trans_presets.java:117 build/trans_presets.java:136
+#: build/trans_presets.java:157 build/trans_presets.java:173
+#: build/trans_presets.java:194 build/trans_presets.java:213
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
+msgid "Max. speed (km/h)"
+msgstr ""
+
+#. item "Highways/Streets/Motorway" text "Max. speed (km/h)"
+#. item "Highways/Streets/Motorway Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk" text "Max. speed (km/h)"
+#. item "Highways/Streets/Trunk Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Primary Link" text "Max. speed (km/h)"
+#. item "Highways/Streets/Secondary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Tertiary" text "Max. speed (km/h)"
+#. item "Highways/Streets/Unclassified" text "Name"
+#. item "Highways/Streets/Residential" text "Name"
+#. <optional>
+#. item "Highways/Streets/Living Street" text "Name"
+#. <optional>
+#. item "Highways/Streets/Pedestrian" text "Name"
+#. <optional>
+#. item "Highways/Streets/Service" text "Name"
+#. item "Highways/Streets/Parking Aisle" label "Edit Parking Aisle"
+#. <space />
+#. <key key="highway" value="service" />
+#. <key key="service" value="parking_aisle" />
+#. <optional>
+#. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
+#. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
+#. item "Highways/Streets/Roundabout" text "Name"
+#. item "Ways/Track" check "Embankment"
+#. item "Ways/Path" check "Embankment"
+#. item "Transport/Railway/Bus Guideway" text "Name"
+#: build/trans_presets.java:82 build/trans_presets.java:99
+#: build/trans_presets.java:118 build/trans_presets.java:137
+#: build/trans_presets.java:158 build/trans_presets.java:174
+#: build/trans_presets.java:195 build/trans_presets.java:214
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
+msgid "Oneway"
+msgstr "Односторонній рух"
+
+#. item "Highways/Streets/Motorway" check "Oneway"
+#. item "Highways/Streets/Motorway Link" check "Oneway"
+#. item "Highways/Streets/Trunk" check "Motorroad"
+#. item "Highways/Streets/Trunk Link" check "Motorroad"
+#. item "Highways/Streets/Primary" check "Motorroad"
+#. item "Highways/Streets/Primary Link" check "Motorroad"
+#. item "Highways/Streets/Secondary" check "Oneway"
+#. item "Highways/Streets/Tertiary" check "Oneway"
+#. item "Highways/Streets/Unclassified" check "Oneway"
+#. item "Highways/Streets/Residential" check "Oneway"
+#. item "Highways/Streets/Living Street" check "Oneway"
+#. item "Highways/Streets/Pedestrian" check "Oneway"
+#. item "Highways/Streets/Service" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
+#. item "Highways/Streets/Roundabout" check "Oneway"
+#. item "Highways/Streets/Roundabout" text "Width (meters)"
+#. </optional>
+#. item "Ways/Track" combo "MTB Scale"
+#. item "Ways/Dedicated Bridleway" check "Oneway"
+#. item "Ways/Dedicated Cycleway" check "Oneway"
+#. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
+#. item "Ways/Combined Foot- and Cycleway" check "Oneway"
+#. item "Ways/Steps" check "Oneway"
+#. item "Transport/Railway/Bus Guideway" check "Oneway"
+#. <button label="Tunnel Start" hotkey="T" icon="styles/standard/vehicle/tunnel.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="tunnel start"/>
+#. <!--action class="ConsolePrinterAction" params="tunnel start,tunnel"/-->
+#. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
+#. </button>
+#: build/trans_presets.java:83 build/trans_presets.java:100
+#: build/trans_presets.java:120 build/trans_presets.java:139
+#: build/trans_presets.java:160 build/trans_presets.java:176
+#: build/trans_presets.java:196 build/trans_presets.java:215
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
+#: build/trans_surveyor.java:12
+msgid "Bridge"
+msgstr "Міст"
+
+#. item "Highways/Streets/Motorway" check "Bridge"
+#. item "Highways/Streets/Motorway Link" check "Bridge"
+#. item "Highways/Streets/Trunk" check "Bridge"
+#. item "Highways/Streets/Trunk Link" check "Bridge"
+#. item "Highways/Streets/Primary" check "Bridge"
+#. item "Highways/Streets/Primary Link" check "Bridge"
+#. item "Highways/Streets/Secondary" check "Bridge"
+#. item "Highways/Streets/Tertiary" check "Bridge"
+#. item "Highways/Streets/Unclassified" check "Bridge"
+#. item "Highways/Streets/Residential" check "Bridge"
+#. item "Highways/Streets/Living Street" check "Bridge"
+#. item "Highways/Streets/Pedestrian" check "Bridge"
+#. item "Highways/Streets/Service" check "Bridge"
+#. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
+#. item "Highways/Streets/Roundabout" check "Bridge"
+#. item "Highways/Streets/Bridge" text "Width (meters)"
+#. </optional>
+#. item "Ways/Track" check "Bridge"
+#. item "Ways/Path" check "Bridge"
+#. item "Ways/Dedicated Bridleway" check "Bridge"
+#. item "Ways/Dedicated Cycleway" check "Bridge"
+#. item "Ways/Segregated Foot- and Cycleway" check "Bridge"
+#. item "Ways/Combined Foot- and Cycleway" check "Bridge"
+#. item "Ways/Dedicated Footway" check "Bridge"
+#. item "Ways/Steps" check "Bridge"
+#. item "Transport/Railway/Bus Guideway" check "Bridge"
+#: build/trans_presets.java:84 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:140
+#: build/trans_presets.java:161 build/trans_presets.java:177
+#: build/trans_presets.java:197 build/trans_presets.java:216
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
+msgid "Tunnel"
+msgstr "Тунель"
+
+#. item "Highways/Streets/Motorway" check "Tunnel"
+#. item "Highways/Streets/Motorway Link" check "Tunnel"
+#. item "Highways/Streets/Trunk" check "Tunnel"
+#. item "Highways/Streets/Trunk Link" check "Tunnel"
+#. item "Highways/Streets/Primary" check "Tunnel"
+#. item "Highways/Streets/Primary Link" check "Tunnel"
+#. item "Highways/Streets/Secondary" check "Tunnel"
+#. item "Highways/Streets/Tertiary" check "Tunnel"
+#. item "Highways/Streets/Unclassified" check "Tunnel"
+#. item "Highways/Streets/Residential" check "Tunnel"
+#. item "Highways/Streets/Living Street" check "Tunnel"
+#. item "Highways/Streets/Pedestrian" check "Tunnel"
+#. item "Highways/Streets/Service" check "Tunnel"
+#. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
+#. item "Highways/Streets/Roundabout" check "Tunnel"
+#. item "Ways/Track" check "Tunnel"
+#. item "Ways/Path" check "Tunnel"
+#. item "Ways/Dedicated Bridleway" check "Tunnel"
+#. item "Ways/Dedicated Cycleway" check "Tunnel"
+#. item "Ways/Segregated Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Combined Foot- and Cycleway" check "Tunnel"
+#. item "Ways/Dedicated Footway" check "Tunnel"
+#. item "Ways/Steps" check "Tunnel"
+#. item "Transport/Railway/Bus Guideway" check "Tunnel"
+#: build/trans_presets.java:85 build/trans_presets.java:102
+#: build/trans_presets.java:122 build/trans_presets.java:141
+#: build/trans_presets.java:162 build/trans_presets.java:178
+#: build/trans_presets.java:198 build/trans_presets.java:217
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
+msgid "Cutting"
+msgstr ""
+
+#. item "Highways/Streets/Motorway" check "Cutting"
+#. item "Highways/Streets/Motorway Link" check "Cutting"
+#. item "Highways/Streets/Trunk" check "Cutting"
+#. item "Highways/Streets/Trunk Link" check "Cutting"
+#. item "Highways/Streets/Primary" check "Cutting"
+#. item "Highways/Streets/Primary Link" check "Cutting"
+#. item "Highways/Streets/Secondary" check "Cutting"
+#. item "Highways/Streets/Tertiary" check "Cutting"
+#. item "Highways/Streets/Unclassified" check "Cutting"
+#. item "Highways/Streets/Residential" check "Cutting"
+#. item "Highways/Streets/Living Street" check "Cutting"
+#. item "Highways/Streets/Pedestrian" check "Cutting"
+#. item "Highways/Streets/Service" check "Cutting"
+#. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
+#. item "Highways/Streets/Roundabout" check "Cutting"
+#. item "Ways/Track" check "Cutting"
+#. item "Ways/Path" check "Cutting"
+#. item "Ways/Dedicated Bridleway" check "Cutting"
+#. item "Ways/Dedicated Cycleway" check "Cutting"
+#. item "Ways/Segregated Foot- and Cycleway" check "Cutting"
+#. item "Ways/Combined Foot- and Cycleway" check "Cutting"
+#. item "Ways/Dedicated Footway" check "Cutting"
+#. item "Ways/Steps" check "Cutting"
+#. item "Transport/Railway/Bus Guideway" check "Cutting"
+#: build/trans_presets.java:86 build/trans_presets.java:103
+#: build/trans_presets.java:123 build/trans_presets.java:142
+#: build/trans_presets.java:163 build/trans_presets.java:179
+#: build/trans_presets.java:199 build/trans_presets.java:218
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
+msgid "Embankment"
+msgstr ""
+
+#. item "Highways/Streets/Motorway" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:89
+msgid "Motorway Link"
+msgstr ""
+
+#. item "Highways/Streets/Motorway Link"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
+#: build/trans_presets.java:92
+msgid "Edit Motorway Link"
+msgstr ""
+
+#. item "Highways/Streets/Motorway Link" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:106
+msgid "Trunk"
+msgstr "Шосе"
+
+#. item "Highways/Streets/Trunk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
+#: build/trans_presets.java:109
+msgid "Edit Trunk"
+msgstr ""
+
+#. item "Highways/Streets/Trunk" check "Oneway"
+#. item "Highways/Streets/Trunk Link" check "Oneway"
+#. item "Highways/Streets/Primary" check "Oneway"
+#. item "Highways/Streets/Primary Link" check "Oneway"
+#: build/trans_presets.java:119 build/trans_presets.java:138
+#: build/trans_presets.java:159 build/trans_presets.java:175
+msgid "Motorroad"
+msgstr ""
+
+#. item "Highways/Streets/Trunk" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:126
+msgid "Trunk Link"
+msgstr ""
+
+#. item "Highways/Streets/Trunk Link"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
+#: build/trans_presets.java:129
+msgid "Edit Trunk Link"
+msgstr ""
+
+#. item "Highways/Streets/Trunk Link" check "Embankment"
+#. </optional>
+#. <separator/>
+#. <button label="Motorway" hotkey="1">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Motorway"/>
+#. </button>
+#: build/trans_presets.java:146 build/trans_surveyor.java:76
+msgid "Primary"
+msgstr "Головна"
+
+#. item "Highways/Streets/Primary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
+#: build/trans_presets.java:149
+msgid "Edit Primary Road"
+msgstr ""
+
+#. item "Highways/Streets/Primary" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:166
+msgid "Primary Link"
+msgstr ""
+
+#. item "Highways/Streets/Primary Link"
+#: build/trans_presets.java:167
+msgid "Edit Primary Link"
+msgstr ""
+
+#. item "Highways/Streets/Primary Link" check "Embankment"
+#. </optional>
+#. <button label="Primary" hotkey="2">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Primary"/>
+#. </button>
+#: build/trans_presets.java:182 build/trans_surveyor.java:80
+msgid "Secondary"
+msgstr "Другорядна"
+
+#. item "Highways/Streets/Secondary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=secondary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
+#: build/trans_presets.java:186
+msgid "Edit Secondary Road"
+msgstr ""
+
+#. item "Highways/Streets/Secondary" check "Embankment"
+#. </optional>
+#: build/trans_presets.java:202
+msgid "Tertiary"
+msgstr ""
+
+#. item "Highways/Streets/Tertiary"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=tertiary"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
+#: build/trans_presets.java:206
+msgid "Edit Tertiary Road"
+msgstr ""
+
+#. item "Highways/Streets/Tertiary" check "Embankment"
+#. </optional>
+#. <button label="Secondary" hotkey="3">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Secondary"/>
+#. </button>
+#: build/trans_presets.java:221 build/trans_surveyor.java:84
+msgid "Unclassified"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=unclassified"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
+#: build/trans_presets.java:225
+msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:578 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
+#. item "Highways/Streets/Service" text "Max. speed (km/h)"
+#. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
+#. item "Highways/Streets/Roundabout" combo "Lanes"
+#. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
+#. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
+#. item "Ways/Path" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
+#. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
+#. item "Public Transport/Railway Platform" text "Reference (track number)"
+#. item "Public Transport/Bus Platform" text "Reference (track number)"
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
+msgid "Width (meters)"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" text "Width (meters)"
+#. </optional>
+#. <button label="Unclassified" hotkey="4">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Unclassified"/>
+#. </button>
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
+msgid "Residential"
+msgstr ""
+
+#. item "Highways/Streets/Residential"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
+#: build/trans_presets.java:244
+msgid "Edit Residential Street"
+msgstr ""
+
+#. item "Highways/Streets/Residential" combo "Layer"
+#. item "Highways/Streets/Living Street" combo "Layer"
+#. item "Highways/Streets/Pedestrian" combo "Layer"
+#. item "Highways/Streets/Service" combo "Layer"
+#. item "Highways/Streets/Parking Aisle" check "Oneway"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
+#. item "Transport/Railway/Bus Guideway" combo "Layer"
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
+msgid "Surface"
+msgstr "Поверхня"
+
+#. item "Highways/Streets/Residential" combo "Surface"
+#. item "Highways/Streets/Living Street" combo "Surface"
+#. item "Highways/Streets/Pedestrian" combo "Surface"
+#. item "Highways/Streets/Service" combo "Surface"
+#. item "Highways/Streets/Parking Aisle" combo "Surface"
+#. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
+#. item "Ways/Track" combo "Surface"
+#. item "Ways/Path" combo "Surface"
+#. item "Ways/Dedicated Bridleway" combo "Surface"
+#. item "Ways/Dedicated Cycleway" combo "Surface"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Surface"
+#. item "Ways/Combined Foot- and Cycleway" combo "Surface"
+#. item "Ways/Dedicated Footway" combo "Surface"
+#. item "Ways/Steps" combo "Surface"
+#. item "Transport/Railway/Bus Guideway" combo "Surface"
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
+msgid "paved"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
+msgid "unpaved"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
+msgid "asphalt"
+msgstr "асфальт"
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
+msgid "concrete"
+msgstr "бетон"
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
+msgid "metal"
+msgstr "метал"
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
+msgid "wood"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
+msgid "paving_stones"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
+msgid "cobblestone"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
+msgid "gravel"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
+msgid "pebblestone"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
+msgid "compacted"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
+msgid "grass_paver"
+msgstr ""
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
+msgid "grass"
+msgstr "трава"
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
+msgid "sand"
+msgstr "пісок"
+
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
+msgid "ground"
+msgstr ""
+
+#. item "Highways/Streets/Residential" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:259
+msgid "Living Street"
+msgstr ""
+
+#. item "Highways/Streets/Living Street"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
+#: build/trans_presets.java:262
+msgid "Edit Living Street"
+msgstr ""
+
+#. item "Highways/Streets/Living Street" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:277
+msgid "Pedestrian"
+msgstr ""
+
+#. item "Highways/Streets/Pedestrian"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
+#: build/trans_presets.java:280
+msgid "Edit Pedestrian Street"
+msgstr ""
+
+#. item "Highways/Streets/Pedestrian" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:295
+msgid "Service"
+msgstr ""
+
+#. item "Highways/Streets/Service"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
+#: build/trans_presets.java:298
+msgid "Edit Serviceway"
+msgstr ""
+
+#. item "Highways/Streets/Service" label "Edit Serviceway"
+#. <space />
+#. <key key="highway" value="service" />
+#. <optional>
+#: build/trans_presets.java:302
+msgid "Serviceway type"
+msgstr ""
+
+#. item "Highways/Streets/Service" combo "Serviceway type"
+#: build/trans_presets.java:302
+msgid "alley"
+msgstr ""
+
+#: build/trans_presets.java:302
+msgid "driveway"
+msgstr ""
+
+#: build/trans_presets.java:302
+msgid "parking_aisle"
+msgstr ""
+
+#. item "Highways/Streets/Service" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:316
+msgid "Parking Aisle"
+msgstr ""
+
+#. item "Highways/Streets/Parking Aisle"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:service=parking_aisle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
+#: build/trans_presets.java:320
+msgid "Edit Parking Aisle"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:329
+msgid "Road (Unknown Type)"
+msgstr ""
+
+#. item "Highways/Streets/Road (Unknown Type)"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
+#: build/trans_presets.java:332
+msgid "Edit Road of unknown type"
+msgstr ""
+
+#. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Будівництво"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr ""
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Перехрестя"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr ""
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:369
+msgid "Road Restrictions"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
+#: build/trans_presets.java:372
+msgid "Edit Road Restrictions"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" check "Oneway"
+#: build/trans_presets.java:374
+msgid "Toll"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" check "Toll"
+#: build/trans_presets.java:375
+msgid "No exit (cul-de-sac)"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
+#. item "Ways/Track" combo "Layer"
+#: build/trans_presets.java:376 build/trans_presets.java:464
+msgid "Access"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" combo "Access"
+#. item "Highways/Streets/Road Restrictions" combo "Agricultural"
+#. item "Highways/Streets/Road Restrictions" combo "Bicycle"
+#. item "Highways/Streets/Road Restrictions" combo "Foot"
+#. item "Highways/Streets/Road Restrictions" combo "Goods"
+#. item "Highways/Streets/Road Restrictions" combo "Heavy Goods Vehicles (hgv)"
+#. item "Highways/Streets/Road Restrictions" combo "Horse"
+#. item "Highways/Streets/Road Restrictions" combo "Motorcycle"
+#. item "Highways/Streets/Road Restrictions" combo "Motorcar"
+#. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
+#. item "Ways/Track" combo "Access"
+#. item "Ways/Track" combo "Motorcycle"
+#. item "Ways/Track" combo "Motorcar"
+#. item "Ways/Path" combo "Foot"
+#. item "Ways/Path" combo "Bicycle"
+#. item "Ways/Path" combo "Horse"
+#. item "Ways/Path" combo "Ski"
+#. item "Ways/Path" combo "Snowmobile"
+#. item "Ways/Path" combo "Motorcar"
+#. item "Waypoints/Traffic Calming" combo "Type"
+#. item "Car/Parking" combo "Park and Ride"
+#. item "Car/Parking" combo "Fee"
+#. item "Car/Parking" combo "Spaces for Disabled"
+#. item "Car/Parking" combo "Spaces for Women"
+#. item "Car/Parking" combo "Spaces for Parents"
+#. item "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"
+#. item "Amenities/Toilets" combo "Fee"
+#. item "Amenities/Bench" combo "Backrest"
+#. item "Amenities/Hunting Stand" combo "Shelter"
+#. item "Amenities/Hunting Stand" combo "Hide"
+#. item "Amenities/Hunting Stand" combo "Lock"
+#. item "Health/Pharmacy" combo "Dispensing"
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
+msgid "yes"
+msgstr "так"
+
+#. color permissive
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="private"/>
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:212
+msgid "private"
+msgstr "приватна"
+
+#. color private
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="destination"/>
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_style.java:219
+msgid "destination"
+msgstr ""
+
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--restrictions tags -->
+#. <!--the restrictions rules should be placed before the path rule! -->
+#.
+#. <rule>
+#. <condition k="access" b="no"/>
+#. <icon src="vehicle/restriction/access.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="access" v="permissive"/>
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+msgid "agricultural"
+msgstr ""
+
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+msgid "forestry"
+msgstr ""
+
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
+msgid "delivery"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
+msgid "no"
+msgstr "ні"
+
+#: build/trans_presets.java:377
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
+msgid "designated"
+msgstr ""
+
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
+msgid "official"
+msgstr ""
+
+#: build/trans_presets.java:380
+msgid "Goods"
+msgstr ""
+
+#: build/trans_presets.java:381
+msgid "Heavy Goods Vehicles (hgv)"
+msgstr ""
+
+#. item "Barriers/Bollard" check "Bicycle"
+#. item "Barriers/Spikes" check "Bicycle"
+#. item "Barriers/Border Control" check "Bicycle"
+#. item "Barriers/Entrance" check "Bicycle"
+#. item "Barriers/Gate" check "Bicycle"
+#. item "Barriers/Lift Gate" check "Bicycle"
+#. item "Barriers/Hampshire Gate" check "Bicycle"
+#. item "Barriers/Bump Gate" check "Bicycle"
+#. item "Barriers/Sally Port" check "Bicycle"
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
+msgid "Horse"
+msgstr "Кінь"
+
+#. item "Barriers/Bollard" check "Horse"
+#. item "Barriers/Cattle Grid" check "Bicycle"
+#. item "Barriers/Spikes" check "Horse"
+#. item "Barriers/Border Control" check "Horse"
+#. item "Barriers/Entrance" check "Horse"
+#. item "Barriers/Gate" check "Horse"
+#. item "Barriers/Lift Gate" check "Horse"
+#. item "Barriers/Hampshire Gate" check "Horse"
+#. item "Barriers/Bump Gate" check "Horse"
+#. item "Barriers/Sally Port" check "Horse"
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
+msgid "Motorcycle"
+msgstr "Мотоцикл"
+
+#. item "Barriers/Cattle Grid" check "Motorcycle"
+#. item "Barriers/Spikes" check "Motorcycle"
+#. item "Barriers/Border Control" check "Motorcycle"
+#. item "Barriers/Entrance" check "Motorcycle"
+#. item "Barriers/Gate" check "Motorcycle"
+#. item "Barriers/Lift Gate" check "Motorcycle"
+#. item "Barriers/Hampshire Gate" check "Motorcycle"
+#. item "Barriers/Bump Gate" check "Motorcycle"
+#. item "Barriers/Sally Port" check "Motorcycle"
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
+msgid "Motorcar"
+msgstr ""
+
+#: build/trans_presets.java:385
+msgid "Public Service Vehicles (psv)"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
+#: build/trans_presets.java:387
+msgid "Min. speed (km/h)"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
+#. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
+#: build/trans_presets.java:388 build/trans_presets.java:427
+msgid "Max. weight (tonnes)"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
+#: build/trans_presets.java:389
+msgid "Max. Height (meters)"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
+#: build/trans_presets.java:390
+msgid "Max. Width (meters)"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
+#: build/trans_presets.java:391
+msgid "Max. Length (meters)"
+msgstr ""
+
+#. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
+#. <separator/>
+#: build/trans_presets.java:394
+msgid "Roundabout"
+msgstr ""
+
+#. item "Highways/Streets/Roundabout"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:junction=roundabout"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:junction=roundabout"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
+#. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
+#: build/trans_presets.java:399
+msgid "Edit Junction"
+msgstr ""
+
+#. item "Highways/Streets/Roundabout" combo "Type"
+#. color motorroad
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="motorway"/>
+#. color motorway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="motorway_link"/>
+#: build/trans_presets.java:402 build/trans_style.java:553
+#: build/trans_style.java:561
+msgid "motorway"
+msgstr ""
+
+#: build/trans_presets.java:402
+msgid "motorway_link"
+msgstr ""
+
+#. color motorway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="trunk"/>
+#. color trunk
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="trunk_link"/>
+#: build/trans_presets.java:402 build/trans_style.java:569
+#: build/trans_style.java:577
+msgid "trunk"
+msgstr "шосе"
+
+#: build/trans_presets.java:402
+msgid "trunk_link"
+msgstr ""
+
+#. color trunk
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="primary"/>
+#. color primary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="primary_link"/>
+#: build/trans_presets.java:402 build/trans_style.java:585
+#: build/trans_style.java:593
+msgid "primary"
+msgstr ""
+
+#: build/trans_presets.java:402
+msgid "primary_link"
+msgstr ""
+
+#. color primary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="secondary"/>
+#. color secondary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="secondary_link"/>
+#: build/trans_presets.java:402 build/trans_style.java:601
+#: build/trans_style.java:609
+msgid "secondary"
+msgstr ""
+
+#. color secondary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="tertiary"/>
+#: build/trans_presets.java:402 build/trans_style.java:617
+msgid "tertiary"
+msgstr ""
+
+#: build/trans_presets.java:402
+msgid "unclassified"
+msgstr ""
+
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="residential"/>
+#: build/trans_presets.java:402 build/trans_style.java:3252
+msgid "residential"
+msgstr ""
+
+#: build/trans_presets.java:402
+msgid "living_street"
+msgstr ""
+
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="service"/>
+#. color address
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <!--public_transport tags -->
+#. <rule>
+#. <condition k="public_transport" v="stop_position"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="public_transport" v="platform"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_presets.java:402 build/trans_style.java:673
+#: build/trans_style.java:4357
+msgid "service"
+msgstr ""
+
+#: build/trans_presets.java:402
+msgid "bus_guideway"
+msgstr ""
+
+#. color turningcircle
+#. <icon annotate="true" src="vehicle/turning_circle.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="passing_place"/>
+#. <icon annotate="true" src="vehicle/passing_place.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="construction"/>
+#. color railland
+#. <icon src="transport/railway_station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="construction"/>
+#. color construction
+#: build/trans_presets.java:402 build/trans_style.java:880
+#: build/trans_style.java:3317 build/trans_style.java:3318
+msgid "construction"
+msgstr ""
+
+#. item "Highways/Streets/Bridge"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:bridge"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:bridge"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
+#: build/trans_presets.java:420
+msgid "Edit Bridge"
+msgstr ""
+
+#. item "Highways/Streets/Tunnel"
+#: build/trans_presets.java:432
+msgid "Edit Tunnel"
+msgstr ""
+
+#. item "Highways/Streets/Tunnel" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:446
+msgid "Ways"
+msgstr ""
+
+#. group "Ways"
+#: build/trans_presets.java:447
+msgid "Track"
+msgstr ""
+
+#. item "Ways/Track"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
+#: build/trans_presets.java:450
+msgid "Edit Track"
+msgstr ""
+
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
+msgid "Tracktype"
+msgstr ""
+
+#. item "Ways/Track" combo "Tracktype"
+#: build/trans_presets.java:455
+msgid "grade1"
+msgstr ""
+
+#: build/trans_presets.java:455
+msgid "grade2"
+msgstr ""
+
+#: build/trans_presets.java:455
+msgid "grade3"
+msgstr ""
+
+#: build/trans_presets.java:455
+msgid "grade4"
+msgstr ""
+
+#: build/trans_presets.java:455
+msgid "grade5"
+msgstr ""
+
+#: build/trans_presets.java:457 build/trans_presets.java:480
+msgid "MTB Scale"
+msgstr ""
+
+#. item "Ways/Track" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:470
+msgid "Path"
+msgstr "Тропа"
+
+#. item "Ways/Path"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
+#: build/trans_presets.java:473
+msgid "Edit Path"
+msgstr ""
+
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:481
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:481
+msgid "good"
+msgstr "добре"
+
+#: build/trans_presets.java:481 build/trans_presets.java:2042
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:481
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:481
+msgid "horrible"
+msgstr ""
+
+#: build/trans_presets.java:490
+msgid "Wheelchairs"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Ski"
+msgstr ""
+
+#: build/trans_presets.java:492
+msgid "Snowmobile"
+msgstr ""
+
+#. item "Ways/Path" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:500
+msgid "Dedicated Bridleway"
+msgstr ""
+
+#. item "Ways/Dedicated Bridleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
+#: build/trans_presets.java:502
+msgid "Edit Bridleway"
+msgstr ""
+
+#. item "Ways/Dedicated Bridleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:518
+msgid "Dedicated Cycleway"
+msgstr ""
+
+#. item "Ways/Dedicated Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#. item "Ways/Segregated Foot- and Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#. item "Ways/Combined Foot- and Cycleway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cycleway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
+msgid "Edit Cycleway"
+msgstr ""
+
+#. item "Ways/Dedicated Cycleway" check "Embankment"
+#: build/trans_presets.java:533
+msgid "Pedestrians"
+msgstr ""
+
+#. item "Ways/Dedicated Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:538
+msgid "Segregated Foot- and Cycleway"
+msgstr ""
+
+#. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:560
+msgid "Combined Foot- and Cycleway"
+msgstr ""
+
+#. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:583
+msgid "Dedicated Footway"
+msgstr ""
+
+#. item "Ways/Dedicated Footway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
+#: build/trans_presets.java:586
+msgid "Edit Footway"
+msgstr ""
+
+#. item "Ways/Dedicated Footway" text "Width (meters)"
+#. </optional>
+#: build/trans_presets.java:601
+msgid "Steps"
+msgstr "Сходи"
+
+#. item "Ways/Steps"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=steps"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
+#: build/trans_presets.java:605
+msgid "Edit Flight of Steps"
+msgstr ""
+
+#. group "Waypoints"
+#: build/trans_presets.java:622
+msgid "Motorway Junction"
+msgstr ""
+
+#. item "Waypoints/Motorway Junction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
+#: build/trans_presets.java:624
+msgid "Edit Motorway Junction"
+msgstr ""
+
+#. item "Waypoints/Motorway Junction" text "Name"
+#: build/trans_presets.java:628
+msgid "Number"
+msgstr "Номер"
+
+#. item "Waypoints/Motorway Junction" text "Number"
+#: build/trans_presets.java:630
+msgid "Services"
+msgstr "Сервіси"
+
+#. item "Waypoints/Services"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
+#: build/trans_presets.java:632
+msgid "Edit Service Station"
+msgstr ""
+
+#. item "Waypoints/Services" text "Name"
+#. item "Barriers/Toll Booth" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
+#. item "Car/Wash" text "Name"
+#. item "Car/Repair" text "Name"
+#. item "Car/Rental" text "Name"
+#. item "Car/Sharing" text "Name"
+#. item "Tourism/Information Terminal" text "Closer description"
+#. item "Tourism/Audioguide" text "Closer description"
+#. item "Man-Made/Buildings/Post Office" text "Name"
+#. item "Man Made/Tower" text "Height (meters)"
+#. item "Man Made/Pipeline" label "Edit Pipeline"
+#. <key key="man_made" value="pipeline" />
+#. item "Man Made/Power Station" text "Name"
+#. item "Man Made/Power Sub Station" label "Edit Power Sub Station"
+#. <key key="power" value="sub_station" />
+#. item "Amenities/Toilets"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=toilets"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=toilets" />
+#. <key key="amenity" value="toilets" />
+#. item "Amenities/Post Box"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box" />
+#. <key key="amenity" value="post_box" />
+#. item "Amenities/Telephone" label "Edit Telephone"
+#. <key key="amenity" value="telephone" />
+#. 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"
+#. <key key="amenity" value="atm" />
+#. item "Health/Emergency Access Point" text "Point Name"
+#. item "Relations/Route" text "Network"
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 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:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
+msgid "Operator"
+msgstr ""
+
+#. item "Waypoints/Services" text "Operator"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:641
+msgid "Traffic Signal"
+msgstr ""
+
+#. item "Waypoints/Traffic Signal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=traffic_signals" />
+#. <key key="highway" value="traffic_signals" />
+#. <optional>
+#: build/trans_presets.java:645
+msgid "Pedestrian crossing type"
+msgstr ""
+
+#. item "Waypoints/Traffic Signal" combo "Pedestrian crossing type"
+#. item "Waypoints/Pedestrian Crossing" combo "Type"
+#. item "Transport/Railway/Crossing" combo "Crossing type"
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
+msgid "uncontrolled"
+msgstr ""
+
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
+msgid "traffic_signals"
+msgstr ""
+
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
+msgid "island"
+msgstr ""
+
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
+msgid "unmarked"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
+msgid "Cross on horseback"
+msgstr ""
+
+#. item "Waypoints/Traffic Signal" check "Cross on horseback"
+#. item "Transport/Railway/Crossing" check "Cross on horseback"
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
+msgid "Cross by bicycle"
+msgstr ""
+
+#. item "Waypoints/Traffic Signal" check "Cross by bicycle"
+#. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
+#. item "Transport/Railway/Crossing" check "Cross by bicycle"
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
+msgid "Crossing attendant"
+msgstr ""
+
+#. item "Waypoints/Traffic Signal" check "Crossing attendant"
+#: build/trans_presets.java:649
+msgid "Crossing type name (UK)"
+msgstr ""
+
+#. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
+#. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
+#: build/trans_presets.java:649 build/trans_presets.java:664
+msgid "zebra"
+msgstr ""
+
+#: build/trans_presets.java:649 build/trans_presets.java:664
+msgid "pelican"
+msgstr ""
+
+#: build/trans_presets.java:649 build/trans_presets.java:664
+msgid "toucan"
+msgstr ""
+
+#: build/trans_presets.java:649 build/trans_presets.java:664
+msgid "puffin"
+msgstr ""
+
+#: build/trans_presets.java:649 build/trans_presets.java:664
+msgid "pegasus"
+msgstr ""
+
+#: build/trans_presets.java:649 build/trans_presets.java:664
+msgid "tiger"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:652
+msgid "Stop"
+msgstr ""
+
+#. item "Waypoints/Stop"
+#. <key key="highway" value="stop" />
+#: build/trans_presets.java:655
+msgid "Pedestrian Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
+#: build/trans_presets.java:658
+msgid "Edit Crossing"
+msgstr ""
+
+#. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
+#: build/trans_presets.java:664
+msgid "Type name (UK)"
+msgstr ""
+
+#: build/trans_presets.java:666
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:668
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:669
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:669
+msgid "chicane"
+msgstr "шикана"
+
+#: build/trans_presets.java:669
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:669
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:669
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:669
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:671
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:673
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:676
+msgid "Mini-roundabout"
+msgstr ""
+
+#. item "Waypoints/Mini-roundabout"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=mini_roundabout"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=mini_roundabout"
+#. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
+#. <key key="highway" value="mini_roundabout" />
+#: build/trans_presets.java:681
+msgid "Direction"
+msgstr "Напрямок"
+
+#. item "Waypoints/Mini-roundabout" combo "Direction"
+#: build/trans_presets.java:681
+msgid "clockwise"
+msgstr ""
+
+#: build/trans_presets.java:683
+msgid "Turning Circle"
+msgstr ""
+
+#. item "Waypoints/Turning Circle"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=turning_circle"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
+#. <key key="highway" value="turning_circle" />
+#: build/trans_presets.java:688
+msgid "City Limit"
+msgstr "Межа міста"
+
+#. item "Waypoints/City Limit"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:690
+msgid "Edit City Limit Sign"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Name"
+#: build/trans_presets.java:695
+msgid "Second Name"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Second Name"
+#: build/trans_presets.java:697
+msgid "Speed Camera"
+msgstr ""
+
+#. item "Waypoints/Speed Camera"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
+#. <key key="highway" value="speed_camera" />
+#: build/trans_presets.java:701
+msgid "Emergency Phone"
+msgstr ""
+
+#. item "Waypoints/Emergency Phone"
+#. <key key="amenity" value="emergency_phone" />
+#: build/trans_presets.java:704
+msgid "Incline"
+msgstr ""
+
+#. item "Waypoints/Incline"
+#. <key key="highway" value="incline" />
+#: build/trans_presets.java:707
+msgid "Incline Steep"
+msgstr ""
+
+#. item "Waypoints/Incline Steep"
+#. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:710
+msgid "Grit Bin"
+msgstr ""
+
+#. item "Waypoints/Grit Bin"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dgrit_bin" />
+#. <key key="amenity" value="grit_bin" />
+#. <separator/>
+#: build/trans_presets.java:715
+msgid "Ford"
+msgstr "Брід"
+
+#. item "Waypoints/Ford"
+#: build/trans_presets.java:716
+msgid "Edit Ford"
+msgstr ""
+
+#. item "Waypoints/Ford" text "Name"
+#. </optional>
+#: build/trans_presets.java:723
+msgid "Mountain Pass"
+msgstr "Перевал"
+
+#. item "Waypoints/Mountain Pass"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
+#: build/trans_presets.java:725
+msgid "Edit Mountain Pass"
+msgstr ""
+
+#. item "Waypoints/Mountain Pass" text "Name"
+#. item "Travel/Accomodation/Alpine Hut" text "Name"
+#. item "Tourism/Guidepost" text "Name"
+#. item "Geography/Places/Peak" text "Name"
+#. item "Geography/Places/Glacier" text "Name"
+#. item "Geography/Places/Volcano" text "Name"
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
+msgid "Elevation"
+msgstr "Висота над рівнем моря"
+
+#. item "Waypoints/Mountain Pass" text "Elevation"
+#. </optional>
+#: build/trans_presets.java:734
+msgid "Barriers"
+msgstr ""
+
+#. group "Barriers"
+#. <!-- *** node barriers *** -->
+#: build/trans_presets.java:737
+msgid "Bollard"
+msgstr ""
+
+#. item "Barriers/Bollard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
+#: build/trans_presets.java:739
+msgid "Edit Bollard"
+msgstr ""
+
+#. item "Barriers/Bollard" label "Edit Bollard"
+#. <space />
+#. <key key="barrier" value="bollard" />
+#. item "Barriers/Cattle Grid" label "Edit Cattle Grid"
+#. <space />
+#. <key key="barrier" value="cattle_grid" />
+#. item "Barriers/Spikes" label "Edit Spikes"
+#. <space />
+#. <key key="barrier" value="spikes" />
+#. item "Barriers/Border Control" label "Edit Border Control"
+#. <space />
+#. <key key="barrier" value="border_control" />
+#. item "Barriers/Entrance" label "Edit Entrance"
+#. <space />
+#. <key key="barrier" value="entrance" />
+#. item "Barriers/Gate" label "Edit Gate"
+#. <space />
+#. <key key="barrier" value="gate" />
+#. item "Barriers/Lift Gate" label "Edit Lift Gate"
+#. <space />
+#. <key key="barrier" value="lift_gate" />
+#. item "Barriers/Hampshire Gate" label "Edit Hampshire Gate"
+#. <space />
+#. <key key="barrier" value="hampshire_gate" />
+#. item "Barriers/Bump Gate" label "Edit Bump Gate"
+#. <space />
+#. <key key="barrier" value="bump_gate" />
+#. item "Barriers/Kissing Gate" label "Edit Kissing Gate"
+#. <space />
+#. <key key="barrier" value="kissing_gate" />
+#. item "Barriers/Stile" label "Edit Stile"
+#. <space />
+#. <key key="barrier" value="stile" />
+#. item "Barriers/Turnstile" label "Edit Turnstile"
+#. <space />
+#. <key key="barrier" value="turnstile" />
+#. item "Barriers/Sally Port" label "Edit Sally Port"
+#. <space />
+#. <key key="barrier" value="sally_port" />
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
+msgid "Allowed traffic:"
+msgstr ""
+
+#. item "Barriers/Bollard" check "Motorcycle"
+#: build/trans_presets.java:749
+msgid "Cycle Barrier"
+msgstr ""
+
+#. item "Barriers/Cycle Barrier"
+#. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
+#. <key key="barrier" value="cycle_barrier" />
+#: build/trans_presets.java:753
+msgid "Block"
+msgstr "Блок"
+
+#. item "Barriers/Block"
+#. <key key="barrier" value="block" />
+#: build/trans_presets.java:756
+msgid "Cattle Grid"
+msgstr ""
+
+#. item "Barriers/Cattle Grid"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
+#: build/trans_presets.java:758
+msgid "Edit Cattle Grid"
+msgstr ""
+
+#. item "Barriers/Cattle Grid" check "Motorcar"
+#: build/trans_presets.java:768
+msgid "Bus Trap"
+msgstr ""
+
+#. item "Barriers/Bus Trap"
+#. <key key="barrier" value="bus_trap" />
+#: build/trans_presets.java:771
+msgid "Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes"
+#: build/trans_presets.java:772
+msgid "Edit Spikes"
+msgstr ""
+
+#. item "Barriers/Spikes" check "Motorcar"
+#: build/trans_presets.java:783
+msgid "Toll Booth"
+msgstr ""
+
+#. item "Barriers/Toll Booth"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
+#: build/trans_presets.java:785
+msgid "Edit Toll Booth"
+msgstr ""
+
+#. item "Barriers/Toll Booth" text "Operator"
+#. </optional>
+#: build/trans_presets.java:793
+msgid "Border Control"
+msgstr ""
+
+#. item "Barriers/Border Control"
+#: build/trans_presets.java:794
+msgid "Edit Border Control"
+msgstr ""
+
+#. item "Barriers/Border Control" check "Motorcar"
+#. <separator/>
+#.
+#. <!-- *** linear barriers *** -->
+#: build/trans_presets.java:808
+msgid "Hedge"
+msgstr ""
+
+#. item "Barriers/Hedge"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
+#. <key key="barrier" value="hedge" />
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:812 build/trans_presets.java:814
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:814
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:814
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:814
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:816
+msgid "Wall"
+msgstr "Стіна"
+
+#. item "Barriers/Wall"
+#. <key key="barrier" value="wall" />
+#: build/trans_presets.java:819
+msgid "City Wall"
+msgstr ""
+
+#. item "Barriers/City Wall"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
+#. <key key="barrier" value="city_wall" />
+#: build/trans_presets.java:823
+msgid "Retaining Wall"
+msgstr ""
+
+#. item "Barriers/Retaining Wall"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=retaining_wall" />
+#. <key key="barrier" value="retaining_wall" />
+#. <separator/>
+#.
+#. <!-- *** access *** -->
+#: build/trans_presets.java:830
+msgid "Entrance"
+msgstr "Вхід"
+
+#. item "Barriers/Entrance"
+#: build/trans_presets.java:831
+msgid "Edit Entrance"
+msgstr ""
+
+#. item "Barriers/Entrance" check "Motorcar"
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:842 build/trans_presets.java:1570
+msgid "Gate"
+msgstr ""
+
+#. item "Barriers/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
+#: build/trans_presets.java:844
+msgid "Edit Gate"
+msgstr ""
+
+#. item "Barriers/Gate" check "Motorcar"
+#: build/trans_presets.java:855
+msgid "Lift Gate"
+msgstr "Шлагбаум"
+
+#. item "Barriers/Lift Gate"
+#: build/trans_presets.java:856
+msgid "Edit Lift Gate"
+msgstr ""
+
+#. item "Barriers/Lift Gate" check "Motorcar"
+#: build/trans_presets.java:867
+msgid "Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate"
+#: build/trans_presets.java:868
+msgid "Edit Hampshire Gate"
+msgstr ""
+
+#. item "Barriers/Hampshire Gate" check "Motorcar"
+#: build/trans_presets.java:879
+msgid "Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate"
+#: build/trans_presets.java:880
+msgid "Edit Bump Gate"
+msgstr ""
+
+#. item "Barriers/Bump Gate" check "Motorcar"
+#: build/trans_presets.java:891
+msgid "Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate"
+#: build/trans_presets.java:892
+msgid "Edit Kissing Gate"
+msgstr ""
+
+#. item "Barriers/Kissing Gate" check "Bicycle"
+#: build/trans_presets.java:900
+msgid "Stile"
+msgstr ""
+
+#. item "Barriers/Stile"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
+#: build/trans_presets.java:902
+msgid "Edit Stile"
+msgstr ""
+
+#. item "Barriers/Stile" check "Bicycle"
+#: build/trans_presets.java:910
+msgid "Turnstile"
+msgstr "Турнікет"
+
+#. item "Barriers/Turnstile"
+#: build/trans_presets.java:911
+msgid "Edit Turnstile"
+msgstr ""
+
+#. item "Barriers/Turnstile" check "Bicycle"
+#: build/trans_presets.java:919
+msgid "Sally Port"
+msgstr ""
+
+#. item "Barriers/Sally Port"
+#: build/trans_presets.java:920
+msgid "Edit Sally Port"
+msgstr ""
+
+#. item "Barriers/Sally Port" check "Motorcar"
+#.
+#. group "Water"
+#. item "Water/Water/River" combo "Layer"
+#. <separator/>
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
+msgid "Water"
+msgstr "Вода"
+
+#. group "Water/Water"
+#: build/trans_presets.java:936
+msgid "Spring"
+msgstr "Джерело"
+
+#. item "Water/Water/Spring"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
+#: build/trans_presets.java:938
+msgid "Edit Spring"
+msgstr ""
+
+#. item "Water/Water/Spring" text "Name"
+#. <separator/>
+#: build/trans_presets.java:943
+msgid "Drain"
+msgstr ""
+
+#. item "Water/Water/Drain"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
+#: build/trans_presets.java:945
+msgid "Edit Drain"
+msgstr ""
+
+#. item "Water/Water/Drain" combo "Layer"
+#: build/trans_presets.java:951
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:953
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:959
+msgid "Stream"
+msgstr "Струмок"
+
+#. item "Water/Water/Stream"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
+#: build/trans_presets.java:961
+msgid "Edit Stream"
+msgstr ""
+
+#. item "Water/Water/Stream" combo "Layer"
+#: build/trans_presets.java:967
+msgid "Canal"
+msgstr "Канал"
+
+#. item "Water/Water/Canal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
+#: build/trans_presets.java:969
+msgid "Edit Canal"
+msgstr ""
+
+#. item "Water/Water/Canal" combo "Layer"
+#: build/trans_presets.java:975
+msgid "River"
+msgstr "Ріка"
+
+#. item "Water/Water/River"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=river"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
+#: build/trans_presets.java:979
+msgid "Edit River"
+msgstr ""
+
+#. item "Water/Water/Water"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
+#: build/trans_presets.java:988
+msgid "Edit Water"
+msgstr ""
+
+#. item "Water/Water/Water" text "Name"
+#: build/trans_presets.java:992
+msgid "Land"
+msgstr "Суходіл"
+
+#. item "Water/Water/Land"
+#: build/trans_presets.java:993
+msgid "Edit Land"
+msgstr ""
+
+#. item "Water/Water/Land" text "Name"
+#. <separator/>
+#: build/trans_presets.java:998
+msgid "Basin"
+msgstr "Водойма"
+
+#. item "Water/Water/Basin"
+#: build/trans_presets.java:999
+msgid "Edit Basin Landuse"
+msgstr ""
+
+#. item "Water/Water/Basin" text "Name"
+#: build/trans_presets.java:1004
+msgid "Reservoir"
+msgstr "Резервуар"
+
+#. item "Water/Water/Reservoir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
+#: build/trans_presets.java:1006
+msgid "Edit Reservoir Landuse"
+msgstr ""
+
+#. item "Water/Water/Reservoir" text "Name"
+#: build/trans_presets.java:1011
+msgid "Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir"
+#: build/trans_presets.java:1012
+msgid "Edit Covered Reservoir"
+msgstr ""
+
+#. item "Water/Water/Covered Reservoir" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1017
+msgid "Riverbank"
+msgstr ""
+
+#. item "Water/Water/Riverbank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
+#: build/trans_presets.java:1020
+msgid "Edit Riverbank"
+msgstr ""
+
+#. item "Water/Water/Riverbank" text "Name"
+#: build/trans_presets.java:1024
+msgid "Wetland"
+msgstr ""
+
+#. item "Water/Water/Wetland"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wetland"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wetland"
+#. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
+#. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
+#: build/trans_presets.java:1029
+msgid "Edit Wetland"
+msgstr ""
+
+#. item "Water/Water/Wetland" combo "Type"
+#: build/trans_presets.java:1032
+msgid "swamp"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "bog"
+msgstr ""
+
+#. color woodarea
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wetland"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_presets.java:1032 build/trans_style.java:3484
+msgid "marsh"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "reedbed"
+msgstr "плавні"
+
+#: build/trans_presets.java:1032
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "mangrove"
+msgstr ""
+
+#: build/trans_presets.java:1034
+msgid "Mud"
+msgstr "Бруд"
+
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1035
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Water/Mud" text "Name"
+#: build/trans_presets.java:1039
+msgid "Beach"
+msgstr "Пляж"
+
+#. item "Water/Water/Beach"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
+#: build/trans_presets.java:1041
+msgid "Edit Beach"
+msgstr ""
+
+#. item "Water/Water/Beach" text "Name"
+#: build/trans_presets.java:1045
+msgid "Bay"
+msgstr "Затока"
+
+#. item "Water/Water/Bay"
+#: build/trans_presets.java:1046
+msgid "Edit Bay"
+msgstr ""
+
+#. item "Water/Water/Bay" text "Name"
+#: build/trans_presets.java:1050
+msgid "Cliff"
+msgstr ""
+
+#. item "Water/Water/Cliff"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
+#: build/trans_presets.java:1052
+msgid "Edit Cliff"
+msgstr ""
+
+#. item "Water/Water/Cliff" text "Name"
+#: build/trans_presets.java:1056
+msgid "Coastline"
+msgstr ""
+
+#. item "Water/Water/Coastline"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
+#: build/trans_presets.java:1058
+msgid "Edit Coastline"
+msgstr ""
+
+#. item "Water/Water/Coastline" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1063
+msgid "Ferry Route"
+msgstr ""
+
+#. item "Water/Water/Ferry Route"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
+#: build/trans_presets.java:1065
+msgid "Edit Ferry"
+msgstr ""
+
+#. item "Water/Water/Ferry Route" text "Name"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1073
+msgid "Boatyard"
+msgstr ""
+
+#. item "Water/Water/Boatyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
+#: build/trans_presets.java:1075
+msgid "Edit Boatyard"
+msgstr ""
+
+#. item "Water/Water/Boatyard" text "Name"
+#: build/trans_presets.java:1080
+msgid "Dock"
+msgstr "Док"
+
+#. item "Water/Water/Dock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
+#: build/trans_presets.java:1082
+msgid "Edit Dock"
+msgstr ""
+
+#. item "Water/Water/Dock" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1088
+msgid "Dam"
+msgstr "Дамба"
+
+#. item "Water/Water/Dam"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1090
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1096
+msgid "Waterway Point"
+msgstr ""
+
+#. group "Waterway Point"
+#: build/trans_presets.java:1097
+msgid "Lock Gate"
+msgstr ""
+
+#. item "Waterway Point/Lock Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
+#. <key key="waterway" value="lock_gate" />
+#: build/trans_presets.java:1101
+msgid "Weir"
+msgstr ""
+
+#. item "Waterway Point/Weir"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
+#: build/trans_presets.java:1103
+msgid "Edit Weir"
+msgstr ""
+
+#. item "Waterway Point/Weir" text "Name"
+#: build/trans_presets.java:1108
+msgid "Waterfall"
+msgstr "Водоспад"
+
+#. item "Waterway Point/Waterfall"
+#: build/trans_presets.java:1109
+msgid "Edit Waterfall"
+msgstr ""
+
+#. item "Waterway Point/Waterfall" text "Name"
+#: build/trans_presets.java:1114
+msgid "Turning Point"
+msgstr ""
+
+#. item "Waterway Point/Turning Point"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
+#. <key key="waterway" value="turning_point" />
+#: build/trans_presets.java:1118
+msgid "Marina"
+msgstr ""
+
+#. item "Waterway Point/Marina"
+#: build/trans_presets.java:1119
+msgid "Edit Marina"
+msgstr ""
+
+#. item "Waterway Point/Marina" text "Name"
+#: build/trans_presets.java:1123
+msgid "Pier"
+msgstr ""
+
+#. item "Waterway Point/Pier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
+#: build/trans_presets.java:1125
+msgid "Edit Pier"
+msgstr ""
+
+#. item "Waterway Point/Pier" text "Name"
+#: build/trans_presets.java:1129
+msgid "Ferry Terminal"
+msgstr ""
+
+#. item "Waterway Point/Ferry Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
+#: build/trans_presets.java:1131
+msgid "Edit Ferry Terminal"
+msgstr ""
+
+#. item "Waterway Point/Ferry Terminal" text "Name"
+#: build/trans_presets.java:1135
+msgid "Slipway"
+msgstr "Сліп"
+
+#. item "Waterway Point/Slipway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=slipway"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1139
+msgid "Edit Slipway"
+msgstr ""
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1145
+msgid "Transport"
+msgstr "Транспорт"
+
+#. group "Transport"
+#: build/trans_presets.java:1146
+msgid "Railway"
+msgstr "Залізниця"
+
+#. group "Transport/Railway"
+#: build/trans_presets.java:1147
+msgid "Rail"
+msgstr ""
+
+#. item "Transport/Railway/Rail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
+#: build/trans_presets.java:1149
+msgid "Edit Rail"
+msgstr ""
+
+#. item "Transport/Railway/Rail" label "Edit Rail"
+#. <space />
+#. <key key="railway" value="rail" />
+#. <optional>
+#. item "Transport/Railway/Narrow Gauge Rail" label "Edit Narrow Gauge Rail"
+#. <space />
+#. <key key="railway" value="narrow_gauge" />
+#. <optional>
+#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
+#. <space />
+#. <key key="railway" value="preserved" />
+#. <optional>
+#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
+#. <space />
+#. <key key="railway" value="light_rail" />
+#. <optional>
+#. item "Transport/Railway/Subway" label "Edit Subway"
+#. <space />
+#. <key key="railway" value="subway" />
+#. <optional>
+#. item "Transport/Railway/Tram" label "Edit Tram"
+#. <space />
+#. <key key="railway" value="tram" />
+#. <optional>
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Monorail" label "Edit Monorail"
+#. <space />
+#. <key key="railway" value="monorail" />
+#. <optional>
+#. item "Transport/Railway/Preserved" combo "Gauge (mm)"
+#. item "Transport/Railway/Light Rail" combo "Gauge (mm)"
+#. item "Transport/Railway/Subway" combo "Gauge (mm)"
+#. item "Transport/Railway/Tram" combo "Gauge (mm)"
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
+msgid "Types"
+msgstr "Типи"
+
+#. item "Transport/Railway/Rail" combo "Types"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Types"
+#. item "Transport/Railway/Monorail" combo "Types"
+#. item "Transport/Railway/Preserved" combo "Types"
+#. item "Transport/Railway/Light Rail" combo "Types"
+#. item "Transport/Railway/Subway" combo "Types"
+#. item "Transport/Railway/Tram" combo "Types"
+#. item "Transport/Railway/Disused Rail" combo "Optional Types"
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
+msgid "yard"
+msgstr "депо"
+
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
+msgid "Electrified"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Electrified"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Electrified"
+#. item "Transport/Railway/Monorail" combo "Electrified"
+#. item "Transport/Railway/Preserved" combo "Electrified"
+#. item "Transport/Railway/Light Rail" combo "Electrified"
+#. item "Transport/Railway/Subway" combo "Electrified"
+#. item "Transport/Railway/Tram" combo "Electrified"
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
+msgid "contact_line"
+msgstr ""
+
+#. color foot
+#. <icon annotate="true" src="transport/steps.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_guideway"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="rail"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="narrow_gauge"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="monorail"/>
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="turntable"/>
+#. <icon annotate="true" src="transport/turntable.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="buffer_stop"/>
+#. <icon annotate="true" src="transport/buffer_stop.png"/>
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="platform"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color rail
+#. color rail
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="funicular"/>
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
+msgid "Voltage"
+msgstr "Напруга"
+
+#. item "Transport/Railway/Rail" combo "Voltage"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Voltage"
+#. item "Transport/Railway/Monorail" combo "Voltage"
+#. item "Transport/Railway/Preserved" combo "Voltage"
+#. item "Transport/Railway/Light Rail" combo "Voltage"
+#. item "Transport/Railway/Subway" combo "Voltage"
+#. item "Transport/Railway/Tram" combo "Voltage"
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
+msgid "Frequency (Hz)"
+msgstr "Частота (Гц)"
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1160
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1161
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1172
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1174
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1184
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1185
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1196
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1197
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1208
+msgid "Subway"
+msgstr "Метрополітен"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1209
+msgid "Edit Subway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1220
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1221
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1232
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1234
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1251
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1252
+msgid "Edit Disused Railway"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
+#. <space />
+#. <key key="railway" value="disused" />
+#: build/trans_presets.java:1255
+msgid "Optional Types"
+msgstr ""
+
+#: build/trans_presets.java:1257
+msgid "Abandoned Rail"
+msgstr ""
+
+#. item "Transport/Railway/Abandoned Rail"
+#. <key key="railway" value="abandoned" />
+#. <separator/>
+#: build/trans_presets.java:1261
+msgid "Level Crossing"
+msgstr ""
+
+#. item "Transport/Railway/Level Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
+#. <key key="railway" value="level_crossing" />
+#: build/trans_presets.java:1265
+msgid "Crossing"
+msgstr ""
+
+#. item "Transport/Railway/Crossing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing" />
+#. <key key="railway" value="crossing" />
+#. <optional>
+#: build/trans_presets.java:1269
+msgid "Crossing type"
+msgstr ""
+
+#. item "Transport/Railway/Crossing" check "Crossing attendant"
+#. </optional>
+#: build/trans_presets.java:1275
+msgid "Turntable"
+msgstr ""
+
+#. item "Transport/Railway/Turntable"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
+#. <key key="railway" value="turntable" />
+#: build/trans_presets.java:1279
+msgid "Buffer Stop"
+msgstr ""
+
+#. item "Transport/Railway/Buffer Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
+#. <key key="railway" value="buffer_stop" />
+#: build/trans_presets.java:1284
+msgid "Aerialway"
+msgstr ""
+
+#. group "Aerialway"
+#: build/trans_presets.java:1285
+msgid "Chair Lift"
+msgstr ""
+
+#. item "Aerialway/Chair Lift"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
+#: build/trans_presets.java:1287
+msgid "Edit Chair Lift"
+msgstr ""
+
+#. item "Aerialway/Chair Lift" text "Name"
+#: build/trans_presets.java:1291
+msgid "Drag Lift"
+msgstr ""
+
+#. item "Aerialway/Drag Lift"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
+#: build/trans_presets.java:1293
+msgid "Edit Drag Lift"
+msgstr ""
+
+#. item "Aerialway/Drag Lift" text "Name"
+#: build/trans_presets.java:1297
+msgid "Cable Car"
+msgstr ""
+
+#. item "Aerialway/Cable Car"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
+#: build/trans_presets.java:1299
+msgid "Edit Cable Car"
+msgstr ""
+
+#. item "Aerialway/Cable Car" text "Name"
+#: build/trans_presets.java:1303
+msgid "Gondola"
+msgstr ""
+
+#. item "Aerialway/Gondola"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1305
+msgid "Edit Gondola"
+msgstr ""
+
+#. item "Aerialway/Gondola" text "Name"
+#: build/trans_presets.java:1309
+msgctxt "aerialway"
+msgid "Station"
+msgstr "Станція"
+
+#. item "Aerialway/Station"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1311
+msgctxt "aerialway"
+msgid "Edit Station"
+msgstr ""
+
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1315
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr "Опора"
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1317
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
+#. group "Car"
+#: build/trans_presets.java:1324
+msgid "Fuel"
+msgstr "Заправка"
+
+#. item "Car/Fuel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fuel"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
+#: build/trans_presets.java:1328
+msgid "Edit Fuel"
+msgstr ""
+
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1330
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1330
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
+#. item "Food+Drinks/Cafe" text "Name"
+#. item "Food+Drinks/Pub" text "Name"
+#. item "Food+Drinks/Biergarten" text "Name"
+#. item "Food+Drinks/Bar" text "Name"
+#. item "Food+Drinks/Nightclub" text "Name"
+#. item "Tourism/Attraction" text "Name"
+#. item "Tourism/Museum" text "Name"
+#. item "Tourism/Zoo" text "Name"
+#. item "Tourism/Theme Park" text "Name"
+#. item "Tourism/Information Office" text "Name"
+#. item "Historic Places/Ruins" text "Name"
+#. item "Historic Places/Archaeological Site" text "Name"
+#. item "Sports/Sport Facilities/Golf Course" text "Name"
+#. item "Sports/Sport Facilities/Miniature Golf" text "Name"
+#. item "Man-Made/Buildings/Library" text "Name"
+#. item "Amenities/Baby Hatch" text "Operator"
+#. item "Shops/Supermarket" text "Name"
+#. item "Shops/Chemist" text "Name"
+#. item "Shops/Convenience Store" text "Name"
+#. item "Shops/Kiosk" text "Name"
+#. item "Shops/Book Store" text "Name"
+#. item "Shops/Travel Agency" text "Name"
+#. item "Shops/Butcher" text "Name"
+#. item "Shops/Baker" text "Name"
+#. item "Shops/Florist" text "Name"
+#. item "Shops/Organic" text "Name"
+#. item "Shops/Alcohol" text "Name"
+#. item "Shops/Beverages" text "Name"
+#. item "Shops/Computer" text "Name"
+#. item "Shops/Electronics" text "Name"
+#. item "Shops/Hifi" text "Name"
+#. item "Shops/Furniture" text "Name"
+#. item "Shops/Garden Centre" text "Name"
+#. item "Shops/Hardware" text "Name"
+#. item "Shops/Do-it-yourself-store" text "Name"
+#. item "Shops/Stationery" text "Name"
+#. item "Shops/Hairdresser" text "Name"
+#. item "Shops/Shoes" text "Name"
+#. item "Shops/Toys" text "Name"
+#. item "Shops/Video" text "Name"
+#. item "Shops/Dry Cleaning" text "Name"
+#. item "Shops/Laundry" text "Name"
+#. item "Shops/Outdoor" text "Name"
+#. item "Shops/Sports" text "Name"
+#. item "Shops/Optician" text "Name"
+#. item "Cash/Bank" text "Operator"
+#. item "Cash/Money Exchange" text "Name"
+#. item "Health/Doctors" text "Name"
+#. item "Health/Dentist" text "Name"
+#. item "Health/Pharmacy" text "Name"
+#. item "Health/Veterinary" text "Name"
+#: build/trans_presets.java:1333 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:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
+msgid "Opening Hours"
+msgstr ""
+
+#. item "Car/Fuel" combo "Opening Hours"
+#. item "Food+Drinks/Restaurant" combo "Opening Hours"
+#. item "Food+Drinks/Fast Food" combo "Opening Hours"
+#. item "Food+Drinks/Cafe" combo "Opening Hours"
+#. item "Food+Drinks/Pub" combo "Opening Hours"
+#. item "Food+Drinks/Biergarten" combo "Opening Hours"
+#. item "Food+Drinks/Bar" combo "Opening Hours"
+#. item "Food+Drinks/Nightclub" combo "Opening Hours"
+#. item "Tourism/Museum" combo "Opening Hours"
+#. item "Tourism/Zoo" combo "Opening Hours"
+#. item "Tourism/Theme Park" combo "Opening Hours"
+#. item "Tourism/Information Office" combo "Opening Hours"
+#. item "Historic Places/Ruins" combo "Opening Hours"
+#. item "Historic Places/Archaeological Site" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Golf Course" combo "Opening Hours"
+#. item "Sports/Sport Facilities/Miniature Golf" combo "Opening Hours"
+#. item "Man-Made/Buildings/Library" combo "Opening Hours"
+#. item "Man-Made/Buildings/Place of Worship" combo "Opening Hours"
+#. item "Shops/Supermarket" combo "Opening Hours"
+#. item "Shops/Chemist" combo "Opening Hours"
+#. item "Shops/Convenience Store" combo "Opening Hours"
+#. item "Shops/Kiosk" combo "Opening Hours"
+#. item "Shops/Book Store" combo "Opening Hours"
+#. item "Shops/Travel Agency" combo "Opening Hours"
+#. item "Shops/Butcher" combo "Opening Hours"
+#. item "Shops/Baker" combo "Opening Hours"
+#. item "Shops/Florist" combo "Opening Hours"
+#. item "Shops/Organic" combo "Opening Hours"
+#. item "Shops/Alcohol" combo "Opening Hours"
+#. item "Shops/Beverages" combo "Opening Hours"
+#. item "Shops/Computer" combo "Opening Hours"
+#. item "Shops/Electronics" combo "Opening Hours"
+#. item "Shops/Hifi" combo "Opening Hours"
+#. item "Shops/Furniture" combo "Opening Hours"
+#. item "Shops/Garden Centre" combo "Opening Hours"
+#. item "Shops/Hardware" combo "Opening Hours"
+#. item "Shops/Do-it-yourself-store" combo "Opening Hours"
+#. item "Shops/Stationery" combo "Opening Hours"
+#. item "Shops/Hairdresser" combo "Opening Hours"
+#. item "Shops/Shoes" combo "Opening Hours"
+#. item "Shops/Toys" combo "Opening Hours"
+#. item "Shops/Video" combo "Opening Hours"
+#. item "Shops/Dry Cleaning" combo "Opening Hours"
+#. item "Shops/Laundry" combo "Opening Hours"
+#. item "Shops/Outdoor" combo "Opening Hours"
+#. item "Shops/Sports" combo "Opening Hours"
+#. item "Shops/Optician" combo "Opening Hours"
+#. item "Cash/Bank" combo "Opening Hours"
+#. item "Cash/Money Exchange" combo "Opening Hours"
+#. item "Health/Doctors" combo "Opening Hours"
+#. item "Health/Dentist" combo "Opening Hours"
+#. item "Health/Pharmacy" combo "Opening Hours"
+#. item "Health/Veterinary" combo "Opening Hours"
+#: build/trans_presets.java:1333 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:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
+msgid "24/7"
+msgstr ""
+
+#: build/trans_presets.java:1333 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:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
+msgid "Mo-Fr 08:30-20:00"
+msgstr ""
+
+#: build/trans_presets.java:1333 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:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
+msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
+msgstr ""
+
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1341
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1342
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1343
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1344
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1345
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1346
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1347
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1348
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
+#. group "Bicycle"
+#. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="village"/>
+#. <!--
+#. <action class="SetNodeAction" params=""/>
+#. <action class="AnnotationPresetAction" params="Places"/>
+#. -->
+#. </button>
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
+#: build/trans_surveyor.java:24
+msgid "Parking"
+msgstr "Стоянка"
+
+#. item "Car/Parking"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
+#: build/trans_presets.java:1354
+msgid "Edit Parking"
+msgstr ""
+
+#. item "Car/Parking" text "Name"
+#. item "Tourism/Information Terminal" text "Operator"
+#. item "Tourism/Audioguide" text "Operator"
+#. item "Amenities/Toilets" text "Operator"
+#. item "Shops/Vending machine" text "Operator"
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
+msgid "Reference number"
+msgstr ""
+
+#. item "Car/Parking" combo "Type"
+#: build/trans_presets.java:1358
+msgid "multi-storey"
+msgstr ""
+
+#: build/trans_presets.java:1358
+msgid "surface"
+msgstr ""
+
+#. item "Man Made/Pipeline" combo "Location"
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
+msgid "underground"
+msgstr ""
+
+#: build/trans_presets.java:1359
+msgid "Park and Ride"
+msgstr ""
+
+#. item "Tourism/Information Terminal" text "Reference number"
+#. item "Tourism/Audioguide" text "Reference number"
+#. item "Amenities/Toilets" text "Reference number"
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+msgid "Fee"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1362
+msgid "Capacity (overall)"
+msgstr ""
+
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1363
+msgid "Spaces for Disabled"
+msgstr ""
+
+#: build/trans_presets.java:1364
+msgid "Spaces for Women"
+msgstr ""
+
+#: build/trans_presets.java:1365
+msgid "Spaces for Parents"
+msgstr ""
+
+#: build/trans_presets.java:1366
+msgid "See the Wiki for other capacity:[types]=*."
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1368
+msgid "Wash"
+msgstr ""
+
+#. item "Car/Wash"
+#: build/trans_presets.java:1369
+msgid "Edit Car Wash"
+msgstr ""
+
+#. item "Car/Wash" text "Operator"
+#: build/trans_presets.java:1374
+msgid "Repair"
+msgstr ""
+
+#. item "Car/Repair"
+#: build/trans_presets.java:1375
+msgid "Edit Car Repair"
+msgstr ""
+
+#. item "Car/Repair" text "Operator"
+#. item "Bicycle/Parking" text "Capacity"
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
+msgid "Rental"
+msgstr ""
+
+#. item "Car/Rental"
+#. <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:1383
+msgid "Edit Car Rental"
+msgstr ""
+
+#. item "Car/Rental" text "Operator"
+#: build/trans_presets.java:1388
+msgid "Sharing"
+msgstr ""
+
+#. item "Car/Sharing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
+#: build/trans_presets.java:1390
+msgid "Edit Car Sharing"
+msgstr ""
+
+#. item "Bicycle/Parking"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
+#: build/trans_presets.java:1399
+msgid "Edit Bicycle Parking"
+msgstr ""
+
+#. item "Bicycle/Parking" text "Name"
+#: build/trans_presets.java:1402
+msgid "Capacity"
+msgstr "Місткість"
+
+#. item "Bicycle/Rental"
+#. <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:1407
+msgid "Edit Bicycle Rental"
+msgstr ""
+
+#. group "Public Transport"
+#: build/trans_presets.java:1413
+msgctxt "railway"
+msgid "Station"
+msgstr "Станція"
+
+#. item "Public Transport/Station"
+#. <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:1416
+msgctxt "railway"
+msgid "Edit Station"
+msgstr ""
+
+#. item "Public Transport/Station" text "Name"
+#: build/trans_presets.java:1421
+msgid "UIC-Reference"
+msgstr ""
+
+#. item "Public Transport/Station" text "UIC-Reference"
+#. </optional>
+#: build/trans_presets.java:1424
+msgid "Railway Halt"
+msgstr ""
+
+#. item "Public Transport/Railway Halt"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
+#: build/trans_presets.java:1426
+msgid "Edit Halt"
+msgstr ""
+
+#. item "Public Transport/Railway Halt" text "Name"
+#. </optional>
+#: build/trans_presets.java:1433
+msgid "Tram Stop"
+msgstr ""
+
+#. item "Public Transport/Tram Stop"
+#. <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:1436
+msgid "Edit Tram Stop"
+msgstr ""
+
+#. item "Public Transport/Tram Stop" text "Name"
+#. </optional>
+#: build/trans_presets.java:1443
+msgid "Railway Platform"
+msgstr "Платформа"
+
+#. item "Public Transport/Railway Platform"
+#. <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:1446
+msgid "Edit Railway Platform"
+msgstr ""
+
+#. item "Public Transport/Railway Platform" label "Edit Railway Platform"
+#. <key key="railway" value="platform" />
+#. <space />
+#. item "Public Transport/Bus Platform" label "Edit Bus Platform"
+#. <key key="highway" value="platform" />
+#. <space />
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
+msgid "Reference (track number)"
+msgstr ""
+
+#. item "Public Transport/Railway Platform" text "Width (meters)"
+#. item "Public Transport/Bus Platform" text "Width (meters)"
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
+msgid "Area"
+msgstr "Ділянка"
+
+#. item "Public Transport/Railway Platform" check "Area"
+#: build/trans_presets.java:1453
+msgid "Subway Entrance"
+msgstr ""
+
+#. item "Public Transport/Subway Entrance"
+#. <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:1456
+msgid "Edit Subway Entrance"
+msgstr ""
+
+#. item "Public Transport/Subway Entrance" text "Name"
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
+msgid "Wheelchair"
+msgstr ""
+
+#. item "Public Transport/Subway Entrance" check "Bicycle"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1466
+msgid "Bus Station"
+msgstr ""
+
+#. item "Public Transport/Bus Station"
+#. <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:1469
+msgid "Edit Bus Station"
+msgstr ""
+
+#. item "Public Transport/Bus Station" text "Name"
+#. </optional>
+#: build/trans_presets.java:1475
+msgid "Bus Stop"
+msgstr ""
+
+#. item "Public Transport/Bus Stop"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
+#. 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:1479
+msgid "Edit Bus Stop"
+msgstr ""
+
+#. item "Public Transport/Bus Stop" text "Name"
+#. item "Tourism/Other Information Points" text "Closer Description"
+#. <separator/>
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
+msgid "Shelter"
+msgstr ""
+
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
+msgid "Bench"
+msgstr ""
+
+#: build/trans_presets.java:1486
+msgid "Tactile Paving"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1490
+msgid "Bus Platform"
+msgstr ""
+
+#. item "Public Transport/Bus Platform"
+#: build/trans_presets.java:1491
+msgid "Edit Bus Platform"
+msgstr ""
+
+#. item "Public Transport/Bus Platform" check "Area"
+#. <separator/>
+#: build/trans_presets.java:1499
+msgid "Taxi"
+msgstr "Таксі"
+
+#. item "Public Transport/Taxi"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
+#: build/trans_presets.java:1501
+msgid "Edit Taxi station"
+msgstr ""
+
+#. item "Public Transport/Taxi" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1507
+msgid "Airport"
+msgstr "Аеропорт"
+
+#. group "Airport"
+#: build/trans_presets.java:1508
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
+#: build/trans_presets.java:1510
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1514
+msgid "IATA"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1515
+msgid "ICAO"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "ICAO"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1519
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1521
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1527
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1529
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1535
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1537
+msgid "Edit Helipad"
+msgstr ""
+
+#. item "Airport/Helipad" text "Reference"
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
+msgid "Apron"
+msgstr "Перон"
+
+#. item "Airport/Apron" label "Apron"
+#. <key key="aeroway" value="apron" />
+#. item "Airport/Hangar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
+msgid "Hangar"
+msgstr "Ангар"
+
+#. item "Airport/Hangar" label "Hangar"
+#. <key key="building" value="hangar" />
+#. item "Airport/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
+#. item "Man Made/Crane" text "Name"
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
+msgid "Beacon"
+msgstr ""
+
+#. item "Airport/Beacon" label "Beacon"
+#. <key key="man_made" value="beacon" />
+#. item "Airport/Windsock"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1564
+msgid "Terminal"
+msgstr "Термінал"
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1566
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr "Подорожі"
+
+#. group "Travel"
+#: build/trans_presets.java:1579
+msgid "Accomodation"
+msgstr ""
+
+#. group "Travel/Accomodation"
+#. <button label="Fuel Station" hotkey="F" icon="styles/standard/vehicle/fuel.png">
+#. <!--action class="SetNodeAction" params="amenity=fuel"/-->
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Fuel"/>
+#. </button>
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
+msgid "Hotel"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel"
+#. <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
+msgid "Edit Hotel"
+msgstr ""
+
+#. item "Travel/Accomodation/Hotel" text "Name"
+#: build/trans_presets.java:1586
+msgid "Stars"
+msgstr "Зірки"
+
+#. item "Travel/Accomodation/Hotel" combo "Stars"
+#: build/trans_presets.java:1588
+msgid "Motel"
+msgstr "Мотель"
+
+#. item "Travel/Accomodation/Motel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
+#: build/trans_presets.java:1590
+msgid "Edit Motel"
+msgstr ""
+
+#. item "Travel/Accomodation/Motel" text "Name"
+#: build/trans_presets.java:1594
+msgid "Guest House"
+msgstr ""
+
+#. item "Travel/Accomodation/Guest House"
+#: build/trans_presets.java:1595
+msgid "Edit Guest House"
+msgstr ""
+
+#. item "Travel/Accomodation/Guest House" text "Name"
+#: build/trans_presets.java:1599
+msgid "Chalet"
+msgstr ""
+
+#. item "Travel/Accomodation/Chalet"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
+#: build/trans_presets.java:1601
+msgid "Edit Chalet"
+msgstr ""
+
+#. item "Travel/Accomodation/Chalet" text "Name"
+#: build/trans_presets.java:1605
+msgid "Hostel"
+msgstr ""
+
+#. item "Travel/Accomodation/Hostel"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
+#: build/trans_presets.java:1607
+msgid "Edit Hostel"
+msgstr ""
+
+#. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
+msgid "Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
+#: build/trans_presets.java:1618
+msgid "Edit Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site" text "Name"
+#: build/trans_presets.java:1622
+msgid "Camping Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Camping Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
+#: build/trans_presets.java:1624
+msgid "Edit Camping Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Camping Site" text "Name"
+#: build/trans_presets.java:1629
+msgid "Food+Drinks"
+msgstr ""
+
+#. group "Food+Drinks"
+#. <button label="Hotel" hotkey="H" icon="styles/standard/accommodation/hotel.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Hotel"/>
+#. </button>
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
+msgid "Restaurant"
+msgstr "Ресторан"
+
+#. item "Food+Drinks/Restaurant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
+#: build/trans_presets.java:1632
+msgid "Edit Restaurant"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" text "Name"
+#. item "Food+Drinks/Fast Food" text "Name"
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "Cuisine"
+msgstr ""
+
+#. item "Food+Drinks/Restaurant" combo "Cuisine"
+#. item "Food+Drinks/Fast Food" combo "Cuisine"
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "italian"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "chinese"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "pizza"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "burger"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "greek"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "german"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "indian"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "regional"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "kebab"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "turkish"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "asian"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "thai"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "mexican"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "japanese"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1638
+msgid "Fast Food"
+msgstr ""
+
+#. item "Food+Drinks/Fast Food"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
+#: build/trans_presets.java:1640
+msgid "Edit Fast Food Restaurant"
+msgstr ""
+
+#: build/trans_presets.java:1643
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1643
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1646
+msgid "Cafe"
+msgstr "Кафе"
+
+#. item "Food+Drinks/Cafe"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
+#: build/trans_presets.java:1648
+msgid "Edit Cafe"
+msgstr ""
+
+#: build/trans_presets.java:1653
+msgid "Pub"
+msgstr "Шинок"
+
+#. item "Food+Drinks/Pub"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
+#: build/trans_presets.java:1655
+msgid "Edit Pub"
+msgstr ""
+
+#: build/trans_presets.java:1660
+msgid "Biergarten"
+msgstr ""
+
+#. item "Food+Drinks/Biergarten"
+#: build/trans_presets.java:1661
+msgid "Edit Biergarten"
+msgstr ""
+
+#: build/trans_presets.java:1666
+msgid "Bar"
+msgstr "Бар"
+
+#. item "Food+Drinks/Bar"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
+#: build/trans_presets.java:1668
+msgid "Edit Bar"
+msgstr ""
+
+#: build/trans_presets.java:1673
+msgid "Nightclub"
+msgstr "Нічний клуб"
+
+#. item "Food+Drinks/Nightclub"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+#: build/trans_presets.java:1675
+msgid "Edit Nightclub"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "Tourism"
+msgstr ""
+
+#. group "Tourism"
+#: build/trans_presets.java:1682
+msgid "Attraction"
+msgstr ""
+
+#. item "Tourism/Attraction"
+#: build/trans_presets.java:1683
+msgid "Edit Attraction"
+msgstr ""
+
+#. item "Tourism/Attraction" text "Opening Hours"
+#: build/trans_presets.java:1688
+msgid "Museum"
+msgstr "Музей"
+
+#. item "Tourism/Museum"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
+#: build/trans_presets.java:1690
+msgid "Edit Museum"
+msgstr ""
+
+#: build/trans_presets.java:1695
+msgid "Zoo"
+msgstr "Зоопарк"
+
+#. item "Tourism/Zoo"
+#. <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
+msgid "Edit Zoo"
+msgstr ""
+
+#: build/trans_presets.java:1703
+msgid "Viewpoint"
+msgstr ""
+
+#. item "Tourism/Viewpoint"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
+#: build/trans_presets.java:1705
+msgid "Edit Viewpoint"
+msgstr ""
+
+#. item "Tourism/Viewpoint" text "Name"
+#: build/trans_presets.java:1708
+msgid "Look-Out Tower"
+msgstr ""
+
+#. item "Tourism/Viewpoint" check "Look-Out Tower"
+#: build/trans_presets.java:1710
+msgid "Theme Park"
+msgstr ""
+
+#. item "Tourism/Theme Park"
+#: build/trans_presets.java:1711
+msgid "Edit Theme Park"
+msgstr ""
+
+#: build/trans_presets.java:1716
+msgid "Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
+#: build/trans_presets.java:1718
+msgid "Edit Artwork"
+msgstr ""
+
+#. item "Tourism/Artwork" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
+#: build/trans_presets.java:1730
+msgid "Map"
+msgstr "Мапа"
+
+#. item "Tourism/Map" text "Name"
+#: build/trans_presets.java:1735
+msgid "Detail Grade"
+msgstr ""
+
+#. item "Tourism/Map" combo "Detail Grade"
+#: build/trans_presets.java:1735
+msgid "topo"
+msgstr ""
+
+#. color tertiary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unclassified"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="unsurfaced"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>20000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="residential"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="living_street"/>
+#: build/trans_presets.java:1735 build/trans_style.java:625
+#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_style.java:665
+msgid "street"
+msgstr ""
+
+#: build/trans_presets.java:1735
+msgid "scheme"
+msgstr "план-схема"
+
+#: build/trans_presets.java:1736
+msgid "Shown Area"
+msgstr ""
+
+#. item "Tourism/Map" combo "Shown Area"
+#: build/trans_presets.java:1736
+msgid "site"
+msgstr ""
+
+#: build/trans_presets.java:1736
+msgid "city"
+msgstr ""
+
+#: build/trans_presets.java:1736
+msgid "region"
+msgstr ""
+
+#. item "Tourism/Other Information Points" text "Name"
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
+msgid "Closer Description"
+msgstr ""
+
+#. item "Tourism/Map" text "Closer Description"
+#. <space />
+#. item "Tourism/Guidepost" text "Elevation"
+#. <space />
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
+msgid "Routes shown for:"
+msgstr ""
+
+#. item "Tourism/Map" label "Routes shown for:"
+#. item "Tourism/Guidepost" label "Routes shown for:"
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
+msgid "Hiking"
+msgstr ""
+
+#. 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
+msgid "Cycling"
+msgstr ""
+
+#. item "Tourism/Map" check "Cycling"
+#. item "Tourism/Guidepost" check "Cycling"
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
+msgid "Mountainbiking"
+msgstr ""
+
+#. 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
+msgid "Skiing"
+msgstr ""
+
+#. item "Tourism/Map" check "Skiing"
+#. item "Tourism/Guidepost" check "Skiing"
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
+msgid "Riding"
+msgstr ""
+
+#. item "Tourism/Map" check "Riding"
+#. item "Tourism/Guidepost" check "Riding"
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
+msgid "... other transportation modes possible"
+msgstr ""
+
+#. item "Tourism/Map" label "... other transportation modes possible"
+#: build/trans_presets.java:1747
+msgid "Information Board"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Name"
+#: build/trans_presets.java:1752
+msgid "Board Content"
+msgstr ""
+
+#. item "Tourism/Information Board" combo "Board Content"
+#: build/trans_presets.java:1752
+msgid "notice"
+msgstr ""
+
+#: build/trans_presets.java:1752
+msgid "history"
+msgstr ""
+
+#: build/trans_presets.java:1752
+msgid "nature"
+msgstr "природа"
+
+#: build/trans_presets.java:1752
+msgid "wildlife"
+msgstr ""
+
+#: build/trans_presets.java:1752
+msgid "plants"
+msgstr ""
+
+#. item "Tourism/Information Board" text "Closer Description"
+#: build/trans_presets.java:1755
+msgid "Guidepost"
+msgstr ""
+
+#. item "Tourism/Guidepost" label "... other transportation modes possible"
+#: build/trans_presets.java:1770
+msgid "Information Terminal"
+msgstr ""
+
+#. item "Tourism/Information Terminal" text "Name"
+#. item "Tourism/Audioguide" text "Name"
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
+msgid "Closer description"
+msgstr ""
+
+#: build/trans_presets.java:1780
+msgid "Audioguide"
+msgstr ""
+
+#. <space />
+#: build/trans_presets.java:1790
+msgid "Audioguide via mobile phone?"
+msgstr ""
+
+#. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
+#: build/trans_presets.java:1791
+msgid "Phone number"
+msgstr "Номер телефону"
+
+#. item "Tourism/Audioguide" text "Phone number"
+#: build/trans_presets.java:1793
+msgid "Other Information Points"
+msgstr ""
+
+#. item "Tourism/Shelter"
+#: build/trans_presets.java:1801
+msgid "Edit Shelter"
+msgstr ""
+
+#. item "Tourism/Shelter" text "Name"
+#. item "Tourism/Picnic Site" text "Name"
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
+msgid "Fireplace"
+msgstr "Вогнище"
+
+#. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:1806
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1807
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
+#: build/trans_presets.java:1813
+msgid "Historic Places"
+msgstr ""
+
+#. group "Historic Places"
+#: build/trans_presets.java:1814
+msgid "Castle"
+msgstr "За́мок"
+
+#. item "Historic Places/Castle"
+#. <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
+msgid "Edit Castle"
+msgstr ""
+
+#. item "Historic Places/Castle" text "Name"
+#: build/trans_presets.java:1821
+msgid "Ruins"
+msgstr "Руїни"
+
+#. item "Historic Places/Ruins"
+#: build/trans_presets.java:1822
+msgid "Edit Ruins"
+msgstr ""
+
+#: build/trans_presets.java:1827
+msgid "Archaeological Site"
+msgstr ""
+
+#. item "Historic Places/Archaeological Site"
+#. <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
+msgid "Edit Archaeological Site"
+msgstr ""
+
+#: build/trans_presets.java:1835
+msgid "Battlefield"
+msgstr ""
+
+#. item "Historic Places/Battlefield"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
+#: build/trans_presets.java:1837
+msgid "Edit Battlefield"
+msgstr ""
+
+#. item "Historic Places/Battlefield" text "Name"
+#: build/trans_presets.java:1841
+msgid "Palaeontological Site"
+msgstr ""
+
+#. item "Historic Places/Palaeontological Site"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
+#: build/trans_presets.java:1843
+msgid "Edit Palaeontological Site"
+msgstr ""
+
+#. item "Historic Places/Palaeontological Site" text "Name"
+#. <separator/>
+#: build/trans_presets.java:1848
+msgid "Monument"
+msgstr "Монумент"
+
+#. item "Historic Places/Monument"
+#: build/trans_presets.java:1849
+msgid "Edit Monument"
+msgstr ""
+
+#. item "Historic Places/Monument" text "Name"
+#: build/trans_presets.java:1853
+msgid "Memorial"
+msgstr "Пам’ятник"
+
+#. item "Historic Places/Memorial"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
+#: build/trans_presets.java:1855
+msgid "Edit Memorial"
+msgstr ""
+
+#. item "Historic Places/Memorial" text "Name"
+#: build/trans_presets.java:1859
+msgid "Wayside Cross"
+msgstr ""
+
+#. item "Historic Places/Wayside Cross"
+#: build/trans_presets.java:1860
+msgid "Edit Wayside Cross"
+msgstr ""
+
+#. item "Historic Places/Wayside Cross" text "Name"
+#: build/trans_presets.java:1864
+msgid "Wayside Shrine"
+msgstr ""
+
+#. item "Historic Places/Wayside Shrine"
+#: build/trans_presets.java:1865
+msgid "Edit Wayside Shrine"
+msgstr ""
+
+#. item "Historic Places/Wayside Shrine" text "Name"
+#: build/trans_presets.java:1869
+msgid "Boundary Stone"
+msgstr ""
+
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:1870
+msgid "Edit Boundary Stone"
+msgstr ""
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1875
+msgid "Leisure"
+msgstr "Дозвілля"
+
+#. group "Leisure"
+#: build/trans_presets.java:1876
+msgid "Water Park"
+msgstr "Аквапарк"
+
+#. item "Leisure/Water Park"
+#: build/trans_presets.java:1877
+msgid "Edit Water Park"
+msgstr ""
+
+#. item "Leisure/Water Park" text "Name"
+#: build/trans_presets.java:1881
+msgid "Playground"
+msgstr ""
+
+#. item "Leisure/Playground"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
+#: build/trans_presets.java:1883
+msgid "Edit Playground"
+msgstr ""
+
+#. item "Leisure/Playground" text "Name"
+#: build/trans_presets.java:1887
+msgid "Fishing"
+msgstr ""
+
+#. item "Leisure/Fishing"
+#: build/trans_presets.java:1888
+msgid "Edit Fishing"
+msgstr ""
+
+#. item "Leisure/Fishing" text "Name"
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1895
+msgid "Sport Facilities"
+msgstr ""
+
+#. group "Sports/Sport Facilities"
+#: build/trans_presets.java:1896
+msgid "Stadium"
+msgstr "Стадіон"
+
+#. item "Sports/Sport Facilities/Stadium"
+#: build/trans_presets.java:1897
+msgid "Edit Stadium"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Stadium" text "Name"
+#. <space />
+#. item "Sports/Sport Facilities/Sports Centre" text "Name"
+#. <space />
+#. item "Sports/Sport Facilities/Pitch" text "Name"
+#. <space />
+#. 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
+msgid "select sport:"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Stadium" label "select sport:"
+#. <space />
+#. item "Sports/Sport Facilities/Sports Centre" label "select sport:"
+#. <space />
+#. item "Sports/Sport Facilities/Pitch" label "select sport:"
+#. <space />
+#. item "Sports/Sport Facilities/Racetrack" label "select sport:"
+#. <space />
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--sport tags -->
+#.
+#. <rule>
+#. <condition k="sport" v="9pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="10pin"/>
+#. color sport
+#. <icon src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="athletics"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="australian_football"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="baseball"/>
+#. color sport
+#. <icon src="sport/baseball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="basketball"/>
+#. color sport
+#. <icon src="sport/basketball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="boules"/>
+#. color sport
+#. <icon src="sport/boule.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="bowls"/>
+#. color sport
+#. <icon src="sport/boule.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="canoe"/>
+#. color sport
+#. <icon src="sport/canoe.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="chess"/>
+#. color sport
+#. <icon src="sport/chess.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="climbing"/>
+#. color sport
+#. <icon src="sport/climbing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cricket"/>
+#. color sport
+#. <icon src="sport/cricket.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cricket_nets"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="croquet"/>
+#. color sport
+#. <icon src="sport/croquet.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="cycling"/>
+#. color sport
+#. <icon src="sport/cycling.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="dog_racing"/>
+#. color sport
+#. <icon src="leisure/dog.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="equestrian"/>
+#. color sport
+#. <icon src="sport/riding.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="football"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="golf"/>
+#. color sport
+#. <icon src="sport/golf.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="gymnastics"/>
+#. color sport
+#. <icon src="sport/multi.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="hockey"/>
+#. color sport
+#. <icon src="sport/hockey.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="horse_racing"/>
+#. color sport
+#. <icon src="sport/riding.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="motor"/>
+#. color sport
+#. <icon src="vehicle/motorbike.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="multi"/>
+#. color sport
+#. <icon src="sport/multi.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="pelota"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="racquet"/>
+#. color sport
+#. <icon src="sport/racquetball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rugby"/>
+#. color sport
+#. <icon src="sport/football.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="skating"/>
+#. color sport
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="skateboard"/>
+#. color sport
+#. <icon src="sport/skateboard.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="soccer"/>
+#. color sport
+#. <icon src="sport/soccer.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="swimming"/>
+#. color sport
+#. <icon src="sport/pool.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="skiing"/>
+#. color sport
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="table_tennis"/>
+#. color sport
+#. <icon src="sport/table_tennis.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="tennis"/>
+#. color sport
+#. <icon src="sport/tennis.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="paintball"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="squash"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="shooting"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="volleyball"/>
+#. color sport
+#. <icon annotate="true" src="sport/volleyball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="beachvolleyball"/>
+#. color sport
+#. <icon annotate="true" src="sport/volleyball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="bowling"/>
+#. color sport
+#. <icon annotate="true" src="sport/10pin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="handball"/>
+#. color sport
+#. <icon annotate="true" src="sport/handball.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="rowing"/>
+#. color sport
+#. <icon annotate="true" src="sport/rowing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="sailing"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="diving"/>
+#. color sport
+#. <icon annotate="true" src="sport/diving.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="badminton"/>
+#. color sport
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="sport" v="archery"/>
+#. color sport
+#. <icon annotate="true" src="sport/archery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <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:3705 build/trans_style.java:3713
+#: build/trans_style.java:3721 build/trans_style.java:3729
+#: build/trans_style.java:3737 build/trans_style.java:3745
+#: build/trans_style.java:3753 build/trans_style.java:3761
+#: build/trans_style.java:3769 build/trans_style.java:3777
+#: build/trans_style.java:3785 build/trans_style.java:3793
+#: build/trans_style.java:3801 build/trans_style.java:3809
+#: build/trans_style.java:3817 build/trans_style.java:3825
+#: build/trans_style.java:3833 build/trans_style.java:3841
+#: build/trans_style.java:3849 build/trans_style.java:3857
+#: build/trans_style.java:3865 build/trans_style.java:3873
+#: build/trans_style.java:3881 build/trans_style.java:3889
+#: build/trans_style.java:3897 build/trans_style.java:3905
+#: build/trans_style.java:3913 build/trans_style.java:3921
+#: build/trans_style.java:3929 build/trans_style.java:3937
+#: build/trans_style.java:3945 build/trans_style.java:3953
+#: build/trans_style.java:3961 build/trans_style.java:3969
+#: build/trans_style.java:3977 build/trans_style.java:3985
+#: build/trans_style.java:3993 build/trans_style.java:4001
+#: build/trans_style.java:4009 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
+msgid "sport"
+msgstr "спорт"
+
+#. item "Sports/Sport Facilities/Stadium" combo "sport"
+#. item "Sports/Sport Facilities/Sports Centre" combo "sport"
+#. 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
+msgid "multi"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "archery"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "athletics"
+msgstr "атлетика"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "australian_football"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "baseball"
+msgstr "бейсбол"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "basketball"
+msgstr "баскетбол"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "boules"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "bowls"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "canoe"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "climbing"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "cricket"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "cricket_nets"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "croquet"
+msgstr "крокет"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "cycling"
+msgstr "велоспорт"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "dog_racing"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "equestrian"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "football"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "golf"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "gymnastics"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "hockey"
+msgstr "хокей"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "horse_racing"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "motor"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "pelota"
+msgstr "пелота"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "racquet"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "rugby"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "shooting"
+msgstr "стрільба"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "skateboard"
+msgstr "скейтборд"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "skating"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "skiing"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "soccer"
+msgstr "футбол"
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "swimming"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "table_tennis"
+msgstr ""
+
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
+msgid "tennis"
+msgstr ""
+
+#: build/trans_presets.java:1905
+msgid "Sports Centre"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Sports Centre"
+#: build/trans_presets.java:1906
+msgid "Edit Sports Centre"
+msgstr ""
+
+#: build/trans_presets.java:1914
+msgid "Pitch"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Pitch"
+#: build/trans_presets.java:1915
+msgid "Edit Pitch"
+msgstr ""
+
+#: build/trans_presets.java:1923
+msgid "Racetrack"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Racetrack"
+#: build/trans_presets.java:1924
+msgid "Edit Racetrack"
+msgstr ""
+
+#: build/trans_presets.java:1932
+msgid "Golf Course"
+msgstr "Поле для гольфу"
+
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:1933
+msgid "Edit Golf Course"
+msgstr ""
+
+#: build/trans_presets.java:1938
+msgid "Miniature Golf"
+msgstr "Міні-гольф"
+
+#. item "Sports/Sport Facilities/Miniature Golf"
+#: build/trans_presets.java:1939
+msgid "Edit Miniature Golf"
+msgstr ""
+
+#: build/trans_presets.java:1945
+msgid "Sport"
+msgstr ""
+
+#. group "Sport"
+#: build/trans_presets.java:1946
+msgid "Multi"
+msgstr ""
+
+#. item "Sport/Multi"
+#: build/trans_presets.java:1947
+msgid "Edit Multi"
+msgstr ""
+
+#. item "Sport/Multi" text "Name"
+#. item "Sport/10pin" text "Name"
+#. item "Sport/Athletics" text "Name"
+#. item "Sport/Archery" text "Name"
+#. item "Sport/Climbing" text "Name"
+#. item "Sport/Canoeing" text "Name"
+#. item "Sport/Cycling" text "Name"
+#. item "Sport/Dog Racing" text "Name"
+#. item "Sport/Equestrian" text "Name"
+#. item "Sport/Horse Racing" text "Name"
+#. item "Sport/Gymnastics" text "Name"
+#. item "Sport/Motor Sports" text "Name"
+#. item "Sport/Skating" text "Name"
+#. item "Sport/Skateboard" text "Name"
+#. item "Sport/Swimming" text "Name"
+#. item "Sport/Shooting" text "Name"
+#. item "Sport (Ball)/Soccer" text "Name"
+#. item "Sport (Ball)/Football" text "Name"
+#. item "Sport (Ball)/Australian Football" text "Name"
+#. item "Sport (Ball)/Baseball" text "Name"
+#. item "Sport (Ball)/Basketball" text "Name"
+#. item "Sport (Ball)/Golf" text "Name"
+#. item "Sport (Ball)/Boule" text "Name"
+#. item "Sport (Ball)/Bowls" text "Name"
+#. item "Sport (Ball)/Cricket" text "Name"
+#. item "Sport (Ball)/Cricket Nets" text "Name"
+#. item "Sport (Ball)/Croquet" text "Name"
+#. item "Sport (Ball)/Hockey" text "Name"
+#. item "Sport (Ball)/Pelota" text "Name"
+#. item "Sport (Ball)/Racquet" text "Name"
+#. item "Sport (Ball)/Rugby" text "Name"
+#. 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
+msgid "type"
+msgstr "тип"
+
+#. item "Sport/Multi" combo "type"
+#. item "Sport/10pin" combo "type"
+#. item "Sport/Athletics" combo "type"
+#. item "Sport/Archery" combo "type"
+#. item "Sport/Climbing" combo "type"
+#. item "Sport/Canoeing" combo "type"
+#. item "Sport/Cycling" combo "type"
+#. item "Sport/Dog Racing" combo "type"
+#. item "Sport/Equestrian" combo "type"
+#. item "Sport/Horse Racing" combo "type"
+#. item "Sport/Gymnastics" combo "type"
+#. item "Sport/Motor Sports" combo "type"
+#. item "Sport/Skating" combo "type"
+#. item "Sport/Skateboard" combo "type"
+#. item "Sport/Swimming" combo "type"
+#. item "Sport/Skiing" combo "type"
+#. item "Sport/Shooting" combo "type"
+#. item "Sport (Ball)/Soccer" combo "type"
+#. item "Sport (Ball)/Football" combo "type"
+#. item "Sport (Ball)/Australian Football" combo "type"
+#. item "Sport (Ball)/Baseball" combo "type"
+#. item "Sport (Ball)/Basketball" combo "type"
+#. item "Sport (Ball)/Boule" combo "type"
+#. item "Sport (Ball)/Bowls" combo "type"
+#. item "Sport (Ball)/Cricket" combo "type"
+#. item "Sport (Ball)/Cricket Nets" combo "type"
+#. item "Sport (Ball)/Croquet" combo "type"
+#. item "Sport (Ball)/Hockey" combo "type"
+#. item "Sport (Ball)/Pelota" combo "type"
+#. item "Sport (Ball)/Racquet" combo "type"
+#. item "Sport (Ball)/Rugby" combo "type"
+#. 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
+msgid "pitch"
+msgstr ""
+
+#: 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
+msgid "sports_centre"
+msgstr ""
+
+#: 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
+msgid "stadium"
+msgstr "стадіон"
+
+#: 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
+msgid "track"
+msgstr ""
+
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
+#: build/trans_presets.java:1959
+msgid "Edit Athletics"
+msgstr ""
+
+#: build/trans_presets.java:1964
+msgid "Archery"
+msgstr "Стрільба з лука"
+
+#. item "Sport/Archery"
+#: build/trans_presets.java:1965
+msgid "Edit Archery"
+msgstr ""
+
+#: build/trans_presets.java:1970
+msgid "Climbing"
+msgstr ""
+
+#. item "Sport/Climbing"
+#: build/trans_presets.java:1971
+msgid "Edit Climbing"
+msgstr ""
+
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr "Веслування"
+
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1977
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
+#: build/trans_presets.java:1983
+msgid "Edit Cycling"
+msgstr ""
+
+#: build/trans_presets.java:1988
+msgid "Dog Racing"
+msgstr ""
+
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:1989
+msgid "Edit Dog Racing"
+msgstr ""
+
+#: build/trans_presets.java:1994
+msgid "Equestrian"
+msgstr "Кінний спорт"
+
+#. item "Sport/Equestrian"
+#: build/trans_presets.java:1995
+msgid "Edit Equestrian"
+msgstr ""
+
+#: build/trans_presets.java:2000
+msgid "Horse Racing"
+msgstr "Кінні перегони"
+
+#. item "Sport/Horse Racing"
+#: build/trans_presets.java:2001
+msgid "Edit Horse Racing"
+msgstr ""
+
+#: build/trans_presets.java:2006
+msgid "Gymnastics"
+msgstr "Гімнастика"
+
+#. item "Sport/Gymnastics"
+#: build/trans_presets.java:2007
+msgid "Edit Gymnastics"
+msgstr ""
+
+#: build/trans_presets.java:2012
+msgid "Motor Sports"
+msgstr ""
+
+#. item "Sport/Motor Sports"
+#: build/trans_presets.java:2013
+msgid "Edit Motor Sports"
+msgstr ""
+
+#: build/trans_presets.java:2018
+msgid "Skating"
+msgstr ""
+
+#. item "Sport/Skating"
+#: build/trans_presets.java:2019
+msgid "Edit Skating"
+msgstr ""
+
+#: build/trans_presets.java:2024
+msgid "Skateboard"
+msgstr "Скейтборд"
+
+#. item "Sport/Skateboard"
+#: build/trans_presets.java:2025
+msgid "Edit Skateboard"
+msgstr ""
+
+#: build/trans_presets.java:2030
+msgid "Swimming"
+msgstr "Плавання"
+
+#. item "Sport/Swimming"
+#: build/trans_presets.java:2031
+msgid "Edit Swimming"
+msgstr ""
+
+#. item "Sport/Skiing"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:2038
+msgid "Edit Skiing"
+msgstr ""
+
+#. item "Sport/Skiing" text "Name"
+#: build/trans_presets.java:2041
+msgid "Piste type"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Piste type"
+#: build/trans_presets.java:2041
+msgid "downhill"
+msgstr ""
+
+#: build/trans_presets.java:2041
+msgid "nordic"
+msgstr ""
+
+#: build/trans_presets.java:2041
+msgid "snow_park"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "Difficulty"
+msgstr "Складність"
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:2042
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "advanced"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "freeride"
+msgstr ""
+
+#: build/trans_presets.java:2045
+msgid "Shooting"
+msgstr "Стрільба"
+
+#. item "Sport/Shooting"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
+#: build/trans_presets.java:2047
+msgid "Edit Shooting"
+msgstr ""
+
+#: build/trans_presets.java:2053
+msgid "Sport (Ball)"
+msgstr ""
+
+#. group "Sport (Ball)"
+#: build/trans_presets.java:2054
+msgid "Soccer"
+msgstr "Футбол"
+
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2055
+msgid "Edit Soccer"
+msgstr ""
+
+#: build/trans_presets.java:2060
+msgid "Football"
+msgstr "Американський футбол"
+
+#. item "Sport (Ball)/Football"
+#: build/trans_presets.java:2061
+msgid "Edit Football"
+msgstr ""
+
+#: build/trans_presets.java:2066
+msgid "Australian Football"
+msgstr ""
+
+#. item "Sport (Ball)/Australian Football"
+#: build/trans_presets.java:2067
+msgid "Edit Australian Football"
+msgstr ""
+
+#: build/trans_presets.java:2072
+msgid "Baseball"
+msgstr "Бейсбол"
+
+#. item "Sport (Ball)/Baseball"
+#: build/trans_presets.java:2073
+msgid "Edit Baseball"
+msgstr ""
+
+#: build/trans_presets.java:2078
+msgid "Basketball"
+msgstr ""
+
+#. item "Sport (Ball)/Basketball"
+#: build/trans_presets.java:2079
+msgid "Edit Basketball"
+msgstr ""
+
+#: build/trans_presets.java:2084
+msgid "Golf"
+msgstr "Гольф"
+
+#. item "Sport (Ball)/Golf"
+#: build/trans_presets.java:2085
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
+#: build/trans_presets.java:2088
+msgid "golf_course"
+msgstr "поле для гольфу"
+
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2091
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
+#: build/trans_presets.java:2097
+msgid "Edit Bowls"
+msgstr ""
+
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr "Крикет"
+
+#. item "Sport (Ball)/Cricket"
+#: build/trans_presets.java:2103
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
+#: build/trans_presets.java:2109
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr "Крокет"
+
+#. item "Sport (Ball)/Croquet"
+#: build/trans_presets.java:2115
+msgid "Edit Croquet"
+msgstr ""
+
+#: build/trans_presets.java:2120
+msgid "Hockey"
+msgstr "Хокей"
+
+#. item "Sport (Ball)/Hockey"
+#: build/trans_presets.java:2121
+msgid "Edit Hockey"
+msgstr ""
+
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr "Пелота"
+
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2127
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
+#: build/trans_presets.java:2133
+msgid "Edit Racquet"
+msgstr ""
+
+#: build/trans_presets.java:2138
+msgid "Rugby"
+msgstr "Регбі"
+
+#. item "Sport (Ball)/Rugby"
+#: build/trans_presets.java:2139
+msgid "Edit Rugby"
+msgstr ""
+
+#: build/trans_presets.java:2144
+msgid "Table Tennis"
+msgstr "Настільний теніс"
+
+#. item "Sport (Ball)/Table Tennis"
+#: build/trans_presets.java:2145
+msgid "Edit Table Tennis"
+msgstr ""
+
+#: build/trans_presets.java:2150
+msgid "Tennis"
+msgstr "Теніс"
+
+#. item "Sport (Ball)/Tennis"
+#: build/trans_presets.java:2151
+msgid "Edit Tennis"
+msgstr ""
+
+#: build/trans_presets.java:2158
+msgid "Man-Made"
+msgstr ""
+
+#. group "Man-Made/Buildings"
+#: build/trans_presets.java:2160
+msgid "Building"
+msgstr "Будівля"
+
+#. item "Man-Made/Buildings/Building"
+#. <key key="building" value="yes" />
+#: build/trans_presets.java:2163
+msgid "Public Building"
+msgstr ""
+
+#. item "Man-Made/Buildings/Public Building"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
+#: build/trans_presets.java:2165
+msgid "Edit Public Building"
+msgstr ""
+
+#. item "Man-Made/Buildings/Public Building" text "Name"
+#: build/trans_presets.java:2169
+msgid "Town hall"
+msgstr "Міська державна адміністрація"
+
+#. item "Man-Made/Buildings/Town hall"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
+#: build/trans_presets.java:2171
+msgid "Edit Town hall"
+msgstr ""
+
+#. item "Man-Made/Buildings/Town hall" text "Name"
+#: build/trans_presets.java:2175
+msgid "Embassy"
+msgstr ""
+
+#. item "Man-Made/Buildings/Embassy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
+#: build/trans_presets.java:2177
+msgid "Edit Embassy"
+msgstr ""
+
+#. item "Man-Made/Buildings/Embassy" text "Name"
+#: build/trans_presets.java:2181
+msgid "Courthouse"
+msgstr "Суд"
+
+#. item "Man-Made/Buildings/Courthouse"
+#. <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
+msgid "Edit Courthouse"
+msgstr ""
+
+#. item "Man-Made/Buildings/Courthouse" text "Name"
+#: build/trans_presets.java:2188
+msgid "Prison"
+msgstr "В’язниця"
+
+#. item "Man-Made/Buildings/Prison"
+#. <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
+msgid "Edit Prison"
+msgstr ""
+
+#. item "Man-Made/Buildings/Prison" text "Name"
+#: build/trans_presets.java:2195
+msgid "Police"
+msgstr ""
+
+#. item "Man-Made/Buildings/Police"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=police"
+#. 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
+msgid "Edit Police"
+msgstr ""
+
+#. item "Man-Made/Buildings/Police" text "Name"
+#: build/trans_presets.java:2203
+msgid "Fire Station"
+msgstr "Пожежна станція"
+
+#. item "Man-Made/Buildings/Fire Station"
+#. <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
+msgid "Edit Fire Station"
+msgstr ""
+
+#. item "Man-Made/Buildings/Fire Station" text "Name"
+#: build/trans_presets.java:2210
+msgid "Post Office"
+msgstr "Пошта"
+
+#. item "Man-Made/Buildings/Post Office"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
+#: build/trans_presets.java:2212
+msgid "Edit Post Office"
+msgstr ""
+
+#. item "Man-Made/Buildings/Post Office" text "Operator"
+#. <separator/>
+#: build/trans_presets.java:2218
+msgid "Kindergarten"
+msgstr ""
+
+#. item "Man-Made/Buildings/Kindergarten"
+#: build/trans_presets.java:2219
+msgid "Edit Kindergarten"
+msgstr ""
+
+#. item "Man-Made/Buildings/Kindergarten" text "Name"
+#: build/trans_presets.java:2223
+msgid "School"
+msgstr "Школа"
+
+#. item "Man-Made/Buildings/School"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
+#: build/trans_presets.java:2225
+msgid "Edit School"
+msgstr ""
+
+#. item "Man-Made/Buildings/School" text "Name"
+#: build/trans_presets.java:2229
+msgid "University"
+msgstr "Університет"
+
+#. item "Man-Made/Buildings/University"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
+#: build/trans_presets.java:2231
+msgid "Edit University"
+msgstr ""
+
+#. item "Man-Made/Buildings/University" text "Name"
+#: build/trans_presets.java:2235
+msgid "College"
+msgstr "Коледж"
+
+#. item "Man-Made/Buildings/College"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
+#: build/trans_presets.java:2237
+msgid "Edit College"
+msgstr ""
+
+#. item "Man-Made/Buildings/College" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2242
+msgid "Cinema"
+msgstr "Кіно"
+
+#. item "Man-Made/Buildings/Cinema"
+#. <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
+msgid "Edit Cinema"
+msgstr ""
+
+#. item "Man-Made/Buildings/Cinema" text "Name"
+#: build/trans_presets.java:2249
+msgid "Library"
+msgstr "Бібліотека"
+
+#. item "Man-Made/Buildings/Library"
+#. <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
+msgid "Edit Library"
+msgstr ""
+
+#: build/trans_presets.java:2257
+msgid "Arts Centre"
+msgstr ""
+
+#. item "Man-Made/Buildings/Arts Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
+#: build/trans_presets.java:2259
+msgid "Edit Arts Centre"
+msgstr ""
+
+#. item "Man-Made/Buildings/Arts Centre" text "Name"
+#: build/trans_presets.java:2263
+msgid "Theatre"
+msgstr "Театр"
+
+#. item "Man-Made/Buildings/Theatre"
+#. <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
+msgid "Edit Theatre"
+msgstr ""
+
+#. item "Man-Made/Buildings/Theatre" text "Name"
+#: build/trans_presets.java:2270
+msgid "Place of Worship"
+msgstr "Культове місце"
+
+#. item "Man-Made/Buildings/Place of Worship"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=place_of_worship"
+#. 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
+msgid "Edit Place of Worship"
+msgstr ""
+
+#. item "Man-Made/Buildings/Place of Worship" text "Name"
+#. item "Land use/Graveyard" text "Name"
+#. item "Land use/Cemetery" text "Name"
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "Religion"
+msgstr "Релігія"
+
+#. item "Man-Made/Buildings/Place of Worship" combo "Religion"
+#. item "Land use/Graveyard" combo "Religion"
+#. item "Land use/Cemetery" combo "Religion"
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "bahai"
+msgstr "бахаі"
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "buddhist"
+msgstr "буддизм"
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "christian"
+msgstr "християнство"
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "hindu"
+msgstr "індуїзм"
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "jain"
+msgstr ""
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "jewish"
+msgstr "іудаїзм"
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "muslim"
+msgstr "іслам"
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "sikh"
+msgstr ""
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "spiritualist"
+msgstr ""
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "taoist"
+msgstr ""
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "unitarian"
+msgstr ""
+
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
+msgid "zoroastrian"
+msgstr "зороастризм"
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "Denomination"
+msgstr "Віросповідання"
+
+#. item "Man-Made/Buildings/Place of Worship" combo "Denomination"
+#. item "Land use/Graveyard" combo "Denomination"
+#. item "Land use/Cemetery" combo "Denomination"
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "anglican"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "baptist"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "catholic"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "evangelical"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "jehovahs_witness"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "lutheran"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "methodist"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "mormon"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "orthodox"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "pentecostal"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "presbyterian"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "protestant"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "quaker"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "shia"
+msgstr ""
+
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
+msgid "sunni"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2282
+msgid "Addresses"
+msgstr "Адреси"
+
+#. item "Man-Made/Buildings/Addresses"
+#. <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
+msgid "Edit Address Information"
+msgstr ""
+
+#. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
+#. <space />
+#: build/trans_presets.java:2287
+msgid "House number"
+msgstr "Номер будинку"
+
+#. item "Man-Made/Buildings/Addresses" text "House number"
+#. <optional>
+#: build/trans_presets.java:2289
+msgid "House name"
+msgstr ""
+
+#. item "Man-Made/Buildings/Addresses" text "House name"
+#: build/trans_presets.java:2290
+msgid "Street name"
+msgstr ""
+
+#. item "Man-Made/Buildings/Addresses" text "Street name"
+#: build/trans_presets.java:2291
+msgid "City name"
+msgstr "Назва міста"
+
+#. item "Man-Made/Buildings/Addresses" text "City name"
+#: build/trans_presets.java:2292
+msgid "Post code"
+msgstr ""
+
+#. item "Man-Made/Buildings/Addresses" text "Post code"
+#: build/trans_presets.java:2293
+msgid "Country code"
+msgstr "Код країни"
+
+#. item "Man-Made/Buildings/Address Interpolation"
+#. <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
+msgid "Edit Address Interpolation"
+msgstr ""
+
+#. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
+#. <space />
+#: build/trans_presets.java:2301
+msgid "Numbering scheme"
+msgstr ""
+
+#. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
+#: build/trans_presets.java:2301
+msgid "odd"
+msgstr "непарні"
+
+#: build/trans_presets.java:2301
+msgid "even"
+msgstr "парні"
+
+#: build/trans_presets.java:2301
+msgid "alphabetic"
+msgstr ""
+
+#: build/trans_presets.java:2304
+msgid "Man Made"
+msgstr ""
+
+#. group "Man Made"
+#: build/trans_presets.java:2305
+msgid "Works"
+msgstr ""
+
+#. item "Man Made/Works"
+#: build/trans_presets.java:2306
+msgid "Edit Works"
+msgstr ""
+
+#. item "Man Made/Works" text "Name"
+#: build/trans_presets.java:2310
+msgid "Tower"
+msgstr "Башта"
+
+#. item "Man Made/Tower"
+#: build/trans_presets.java:2311
+msgid "Edit Tower"
+msgstr ""
+
+#. item "Man Made/Tower" text "Name"
+#: build/trans_presets.java:2314
+msgid "Tower type"
+msgstr ""
+
+#. item "Man Made/Tower" combo "Tower type"
+#: build/trans_presets.java:2314
+msgid "communication"
+msgstr ""
+
+#: build/trans_presets.java:2314
+msgid "observation"
+msgstr ""
+
+#. <optional>
+#: build/trans_presets.java:2316
+msgid "Height (meters)"
+msgstr ""
+
+#. item "Man Made/Tower" text "Operator"
+#. </optional>
+#: build/trans_presets.java:2320
+msgid "Water Tower"
+msgstr ""
+
+#. item "Man Made/Water Tower"
+#: build/trans_presets.java:2321
+msgid "Edit Water Tower"
+msgstr ""
+
+#. item "Man Made/Water Tower" text "Name"
+#: build/trans_presets.java:2325
+msgid "Gasometer"
+msgstr ""
+
+#. item "Man Made/Gasometer"
+#: build/trans_presets.java:2326
+msgid "Edit Gasometer"
+msgstr ""
+
+#. item "Man Made/Gasometer" text "Name"
+#: build/trans_presets.java:2330
+msgid "Lighthouse"
+msgstr "Маяк"
+
+#. item "Man Made/Lighthouse"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
+#: build/trans_presets.java:2332
+msgid "Edit Lighthouse"
+msgstr ""
+
+#. item "Man Made/Lighthouse" text "Name"
+#: build/trans_presets.java:2336
+msgid "Windmill"
+msgstr "Вітряк"
+
+#. item "Man Made/Windmill"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
+#: build/trans_presets.java:2338
+msgid "Edit Windmill"
+msgstr ""
+
+#. item "Man Made/Windmill" text "Name"
+#: build/trans_presets.java:2342
+msgid "Pipeline"
+msgstr ""
+
+#. item "Man Made/Pipeline"
+#. <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
+msgid "Edit Pipeline"
+msgstr ""
+
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
+msgid "gas"
+msgstr "газ"
+
+#: build/trans_presets.java:2348
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2348
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2348
+msgid "sewage"
+msgstr ""
+
+#: build/trans_presets.java:2348
+msgid "any substance"
+msgstr ""
+
+#: build/trans_presets.java:2349
+msgid "Location"
+msgstr "Розташування"
+
+#: build/trans_presets.java:2349
+msgid "underwater"
+msgstr ""
+
+#: build/trans_presets.java:2349
+msgid "overground"
+msgstr ""
+
+#: build/trans_presets.java:2351
+msgid "Wastewater Plant"
+msgstr ""
+
+#. item "Man Made/Wastewater Plant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=wastewater_plant"
+#. 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
+msgid "Edit Wastewater Plant"
+msgstr ""
+
+#. item "Man Made/Wastewater Plant" text "Name"
+#: build/trans_presets.java:2359
+msgid "Crane"
+msgstr "Кран"
+
+#. item "Man Made/Crane"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
+#: build/trans_presets.java:2361
+msgid "Edit Crane"
+msgstr ""
+
+#. item "Man Made/Beacon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
+#: build/trans_presets.java:2367
+msgid "Edit Beacon"
+msgstr ""
+
+#. item "Man Made/Beacon" text "Name"
+#: build/trans_presets.java:2371
+msgid "Survey Point"
+msgstr ""
+
+#. item "Man Made/Survey Point"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
+#: build/trans_presets.java:2373
+msgid "Edit Survey Point"
+msgstr ""
+
+#. item "Man Made/Survey Point" text "Name"
+#: build/trans_presets.java:2377
+msgid "Surveillance"
+msgstr ""
+
+#. item "Man Made/Surveillance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
+#: build/trans_presets.java:2379
+msgid "Edit Surveillance Camera"
+msgstr ""
+
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2382
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2382
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2382
+msgid "public"
+msgstr "загальнодоступне"
+
+#. <separator/>
+#: build/trans_presets.java:2385
+msgid "Power Generator"
+msgstr ""
+
+#. item "Man Made/Power Generator"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=generator"
+#. 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:2389
+msgid "Edit Power Generator"
+msgstr ""
+
+#. item "Man Made/Power Generator" combo "Type"
+#: build/trans_presets.java:2391
+msgid "wind"
+msgstr ""
+
+#: build/trans_presets.java:2391
+msgid "hydro"
+msgstr ""
+
+#: build/trans_presets.java:2391
+msgid "fossil"
+msgstr ""
+
+#: build/trans_presets.java:2391
+msgid "nuclear"
+msgstr ""
+
+#: build/trans_presets.java:2391
+msgid "coal"
+msgstr ""
+
+#: build/trans_presets.java:2391
+msgid "photovoltaic"
+msgstr ""
+
+#. item "Man Made/Power Generator" text "Name"
+#: build/trans_presets.java:2394
+msgid "Power Station"
+msgstr ""
+
+#. item "Man Made/Power Station"
+#. <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:2397
+msgid "Edit Power Station"
+msgstr ""
+
+#. item "Man Made/Power Station" text "Reference"
+#: build/trans_presets.java:2403
+msgid "Power Sub Station"
+msgstr ""
+
+#. item "Man Made/Power Sub Station"
+#. <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:2406
+msgid "Edit Power Sub Station"
+msgstr ""
+
+#. item "Man Made/Power Sub Station" text "Operator"
+#. item "Man Made/Power Line" text "Operator"
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
+msgid "Line reference"
+msgstr ""
+
+#. item "Man Made/Power Sub Station" text "Line reference"
+#: build/trans_presets.java:2411
+msgid "Power Tower"
+msgstr ""
+
+#. item "Man Made/Power Tower"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=tower"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=tower"
+#. 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:2416
+msgid "Edit Power Tower"
+msgstr ""
+
+#. item "Man Made/Power Tower" combo "Type"
+#: build/trans_presets.java:2417
+msgid "tower"
+msgstr ""
+
+#: build/trans_presets.java:2417
+msgid "pole"
+msgstr ""
+
+#: build/trans_presets.java:2418
+msgid "Tower reference"
+msgstr ""
+
+#. item "Man Made/Power Tower" text "Tower reference"
+#: build/trans_presets.java:2420
+msgid "Power Line"
+msgstr ""
+
+#. item "Man Made/Power Line"
+#. <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:2423
+msgid "Edit Power Line"
+msgstr ""
+
+#. item "Man Made/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:2424
+msgid "Line type"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Line type"
+#: build/trans_presets.java:2424
+msgid "line"
+msgstr ""
+
+#: build/trans_presets.java:2424
+msgid "minor_line"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2429
+msgid "Amount of Cables"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Amount of Cables"
+#: build/trans_presets.java:2430
+msgid "Number of wires (better: conductors) per power cable"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
+#: build/trans_presets.java:2430
+msgid "single"
+msgstr ""
+
+#: build/trans_presets.java:2430
+msgid "double"
+msgstr ""
+
+#: build/trans_presets.java:2430
+msgid "triple"
+msgstr ""
+
+#: build/trans_presets.java:2430
+msgid "quad"
+msgstr ""
+
+#: build/trans_presets.java:2433
+msgid "Amenities"
+msgstr ""
+
+#. group "Amenities"
+#: build/trans_presets.java:2434
+msgid "Toilets"
+msgstr "Туалет"
+
+#: build/trans_presets.java:2441
+msgid "limited"
+msgstr ""
+
+#. item "Shops/Vending machine" text "Reference number"
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
+msgid "Note"
+msgstr "Примітка"
+
+#. item "Amenities/Toilets" text "Note"
+#: build/trans_presets.java:2444
+msgid "Post Box"
+msgstr "Поштова скринька"
+
+#. item "Amenities/Post Box" text "Operator"
+#: build/trans_presets.java:2449
+msgid "Telephone"
+msgstr "Телефон"
+
+#. item "Amenities/Telephone"
+#. <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:2452
+msgid "Edit Telephone"
+msgstr ""
+
+#. item "Amenities/Telephone" text "Operator"
+#. item "Shops/Vending machine" text "Note"
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
+msgid "Coins"
+msgstr "Монети"
+
+#. item "Amenities/Telephone" check "Coins"
+#. item "Shops/Vending machine" check "Coins"
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
+msgid "Notes"
+msgstr "Банкноти"
+
+#. item "Amenities/Telephone" check "Notes"
+#. item "Shops/Vending machine" check "Notes"
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
+msgid "Electronic purses and Charge cards"
+msgstr ""
+
+#. item "Amenities/Telephone" check "Electronic purses and Charge cards"
+#. item "Shops/Vending machine" check "Electronic purses and Charge cards"
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
+msgid "Debit cards"
+msgstr ""
+
+#. item "Amenities/Telephone" check "Debit cards"
+#. item "Shops/Vending machine" check "Debit cards"
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
+msgid "Credit cards"
+msgstr ""
+
+#. item "Amenities/Telephone" check "Credit cards"
+#: build/trans_presets.java:2460
+msgid "Telephone cards"
+msgstr ""
+
+#. item "Amenities/Telephone" check "Telephone cards"
+#: build/trans_presets.java:2462
+msgid "Recycling"
+msgstr ""
+
+#. item "Amenities/Recycling"
+#. <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:2465
+msgid "Edit Recycling station"
+msgstr ""
+
+#. item "Amenities/Recycling" label "Edit Recycling station"
+#. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2467
+msgid "Batteries"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2468
+msgid "Cans"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2469
+msgid "Clothes"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Clothes"
+#: build/trans_presets.java:2470
+msgid "Glass"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2471
+msgid "Paper"
+msgstr "Папір"
+
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2472
+msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2474
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2476
+msgid "Edit Waste Basket"
+msgstr ""
+
+#. item "Amenities/Bench"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
+#. <key key="amenity" value="bench" />
+#: build/trans_presets.java:2482
+msgid "Backrest"
+msgstr ""
+
+#: build/trans_presets.java:2483
+msgid "Material"
+msgstr "Матеріал"
+
+#. item "Amenities/Bench" combo "Material"
+#: build/trans_presets.java:2483
+msgid "stone"
+msgstr "камінь"
+
+#: build/trans_presets.java:2483
+msgid "plastic"
+msgstr ""
+
+#: build/trans_presets.java:2484
+msgid "Colour"
+msgstr "Колір"
+
+#. item "Amenities/Bench" combo "Colour"
+#: build/trans_presets.java:2484
+msgid "black"
+msgstr "чорний"
+
+#: build/trans_presets.java:2484
+msgid "brown"
+msgstr "коричневий"
+
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--landuse tags -->
+#.
+#. <rule>
+#. <condition k="landuse" v="farm"/>
+#. color green
+#. <icon annotate="true" src="misc/landmark/farm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmland"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="meadow"/>
+#. color green
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="vineyard"/>
+#. color green
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="orchard"/>
+#. color forest
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="allotments"/>
+#. color green
+#. <icon src="misc/landmark/plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="grass"/>
+#. color cemetery
+#. <icon src="rendering/landuse/cemetery.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="village_green"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="recreation_ground"/>
+#: build/trans_presets.java:2484 build/trans_style.java:3157
+#: build/trans_style.java:3165 build/trans_style.java:3173
+#: build/trans_style.java:3181 build/trans_style.java:3189
+#: build/trans_style.java:3236 build/trans_style.java:3244
+#: build/trans_style.java:3342 build/trans_style.java:3350
+msgid "green"
+msgstr "зелений"
+
+#: build/trans_presets.java:2484
+msgid "red"
+msgstr "червоний"
+
+#: build/trans_presets.java:2484
+msgid "blue"
+msgstr "синій"
+
+#: build/trans_presets.java:2484
+msgid "gray"
+msgstr "сірий"
+
+#: build/trans_presets.java:2484
+msgid "white"
+msgstr "білий"
+
+#: build/trans_presets.java:2485
+msgid "Amount of Seats"
+msgstr ""
+
+#. item "Amenities/Bench" combo "Amount of Seats"
+#: build/trans_presets.java:2487
+msgid "Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand"
+#: build/trans_presets.java:2488
+msgid "Edit Hunting Stand"
+msgstr ""
+
+#. item "Amenities/Hunting Stand" label "Edit Hunting Stand"
+#. <key key="amenity" value="hunting_stand" />
+#. item "Land use/Tree" text "Type"
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
+msgid "Height"
+msgstr "Висота"
+
+#. item "Amenities/Hunting Stand" combo "Height"
+#: build/trans_presets.java:2490
+msgid "low"
+msgstr "низька"
+
+#: build/trans_presets.java:2490
+msgid "half"
+msgstr ""
+
+#: build/trans_presets.java:2490
+msgid "full"
+msgstr ""
+
+#: build/trans_presets.java:2492
+msgid "Hide"
+msgstr ""
+
+#: build/trans_presets.java:2493
+msgid "Lock"
+msgstr ""
+
+#: build/trans_presets.java:2495
+msgid "Fountain"
+msgstr "Фонтан"
+
+#. item "Amenities/Fountain"
+#. <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:2498
+msgid "Edit Fountain"
+msgstr ""
+
+#. item "Amenities/Fountain" text "Name"
+#: build/trans_presets.java:2502
+msgid "Drinking Water"
+msgstr ""
+
+#. item "Amenities/Drinking Water"
+#. <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:2505
+msgid "Edit Drinking Water"
+msgstr ""
+
+#. item "Amenities/Drinking Water" text "Name"
+#: build/trans_presets.java:2509
+msgid "Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
+#. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
+#: build/trans_presets.java:2512
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2515
+msgid "Baby Hatch"
+msgstr ""
+
+#. item "Amenities/Baby Hatch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:2517
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Amenities/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:2523
+msgid "Shops"
+msgstr ""
+
+#. group "Shops"
+#: build/trans_presets.java:2524
+msgid "Car Dealer"
+msgstr ""
+
+#. item "Shops/Car Dealer"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
+#: build/trans_presets.java:2526
+msgid "Edit Car Shop"
+msgstr ""
+
+#. item "Shops/Car Dealer" text "Operator"
+#: build/trans_presets.java:2531
+msgid "Bike Dealer"
+msgstr "Веломагазин"
+
+#. 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:2534
+msgid "Edit Bicycle Shop"
+msgstr ""
+
+#. item "Shops/Bike Dealer" text "Name"
+#: build/trans_presets.java:2538
+msgid "Supermarket"
+msgstr "Супермаркет"
+
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2539
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2544
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
+#: build/trans_presets.java:2545
+msgid "Edit Chemist"
+msgstr ""
+
+#: build/trans_presets.java:2550
+msgid "Convenience Store"
+msgstr ""
+
+#. item "Shops/Convenience Store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
+#: build/trans_presets.java:2552
+msgid "Edit Convenience Store"
+msgstr ""
+
+#: build/trans_presets.java:2557
+msgid "Kiosk"
+msgstr "Кіоск"
+
+#. item "Shops/Kiosk"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
+#: build/trans_presets.java:2559
+msgid "Edit Kiosk"
+msgstr ""
+
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
+#: build/trans_presets.java:2571
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr ""
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr ""
+
+#: build/trans_presets.java:2583
+msgid "Baker"
+msgstr ""
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr ""
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr ""
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr ""
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr ""
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Напої"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Комп'ютери"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Електроніка"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr ""
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr ""
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Взуття"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Іграшки"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr ""
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Відео"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr ""
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr ""
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr ""
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr ""
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Оптика"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2725
+msgid "Vending machine"
+msgstr ""
+
+#. item "Shops/Vending machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
+#: build/trans_presets.java:2727
+msgid "Edit Vending machine"
+msgstr ""
+
+#. item "Shops/Vending machine" label "Edit Vending machine"
+#. <key key="amenity" value="vending_machine" />
+#: build/trans_presets.java:2729
+msgid "Vending products"
+msgstr ""
+
+#. item "Shops/Vending machine" combo "Vending products"
+#: build/trans_presets.java:2729
+msgid "public_transport_tickets"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "public_transport_plans"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "parking_tickets"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "food"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "drinks"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "sweets"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "cigarettes"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "photos"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "animal_food"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "news_papers"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "toys"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "stamps"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "SIM-cards"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "telephone_vouchers"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "vouchers"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "condoms"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "tampons"
+msgstr ""
+
+#: build/trans_presets.java:2729
+msgid "excrement_bags"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Credit cards"
+#: build/trans_presets.java:2738
+msgid "Account or loyalty cards"
+msgstr ""
+
+#. item "Shops/Vending machine" check "Account or loyalty cards"
+#: build/trans_presets.java:2741
+msgid "Cash"
+msgstr "Готівка"
+
+#. group "Cash"
+#: build/trans_presets.java:2742
+msgid "Bank"
+msgstr "Банк"
+
+#. item "Cash/Bank"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:2744
+msgid "Edit Bank"
+msgstr ""
+
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
+msgid "Automated Teller Machine"
+msgstr "Банкомат"
+
+#. item "Cash/Bank" check "Automated Teller Machine"
+#: build/trans_presets.java:2751
+msgid "Money Exchange"
+msgstr ""
+
+#. item "Cash/Money Exchange"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
+#: build/trans_presets.java:2753
+msgid "Edit Money Exchange"
+msgstr ""
+
+#. item "Cash/Automated Teller Machine"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
+#: build/trans_presets.java:2760
+msgid "Edit Automated Teller Machine"
+msgstr ""
+
+#. item "Cash/Automated Teller Machine" text "Operator"
+#: build/trans_presets.java:2765
+msgid "Health"
+msgstr ""
+
+#. group "Health"
+#: build/trans_presets.java:2766
+msgid "Doctors"
+msgstr ""
+
+#. item "Health/Doctors"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
+#: build/trans_presets.java:2768
+msgid "Edit Doctors"
+msgstr ""
+
+#: build/trans_presets.java:2773
+msgid "Dentist"
+msgstr ""
+
+#. item "Health/Dentist"
+#: build/trans_presets.java:2774
+msgid "Edit Dentist"
+msgstr ""
+
+#: build/trans_presets.java:2779
+msgid "Pharmacy"
+msgstr "Аптека"
+
+#. item "Health/Pharmacy"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
+#: build/trans_presets.java:2781
+msgid "Edit Pharmacy"
+msgstr ""
+
+#. item "Health/Pharmacy" label "Edit Pharmacy"
+#. <key key="amenity" value="pharmacy" />
+#: build/trans_presets.java:2783
+msgid "Dispensing"
+msgstr ""
+
+#: build/trans_presets.java:2787
+msgid "Hospital"
+msgstr "Лікарня"
+
+#. item "Health/Hospital"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
+#: build/trans_presets.java:2789
+msgid "Edit Hospital"
+msgstr ""
+
+#. item "Health/Hospital" text "Name"
+#: build/trans_presets.java:2793
+msgid "Emergency Access Point"
+msgstr ""
+
+#. item "Health/Emergency Access Point"
+#. <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:2796
+msgid "Edit Emergency Access Point"
+msgstr ""
+
+#. item "Health/Emergency Access Point" label "Edit Emergency Access Point"
+#. <space />
+#. <key key="highway" value="emergency_access_point" />
+#: build/trans_presets.java:2799
+msgid "Point Number"
+msgstr ""
+
+#. item "Health/Emergency Access Point" text "Point Number"
+#: build/trans_presets.java:2800
+msgid "Point Name"
+msgstr ""
+
+#. item "Health/Emergency Access Point" text "Operator"
+#: build/trans_presets.java:2802
+msgid "Phone Number"
+msgstr "Номер телефону"
+
+#. item "Health/Emergency Access Point" text "Phone Number"
+#: build/trans_presets.java:2803
+msgid "(Use international code, like +12-345-67890)"
+msgstr ""
+
+#. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
+#. <space />
+#: build/trans_presets.java:2806
+msgid "Veterinary"
+msgstr ""
+
+#. item "Health/Veterinary"
+#. <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:2809
+msgid "Edit Veterinary"
+msgstr ""
+
+#: build/trans_presets.java:2816
+msgid "Geography"
+msgstr "Географія"
+
+#. group "Geography"
+#: build/trans_presets.java:2817
+msgid "Places"
+msgstr "Місця"
+
+#. group "Geography/Places"
+#: build/trans_presets.java:2818
+msgid "Continent"
+msgstr ""
+
+#. item "Geography/Places/Continent"
+#: build/trans_presets.java:2819
+msgid "Edit Continent"
+msgstr ""
+
+#. item "Geography/Places/Continent" text "Name"
+#: build/trans_presets.java:2824
+msgid "Country"
+msgstr "Країна"
+
+#. item "Geography/Places/Country"
+#: build/trans_presets.java:2825
+msgid "Edit Country"
+msgstr ""
+
+#. item "Geography/Places/Country" text "Name"
+#: build/trans_presets.java:2830
+msgid "State"
+msgstr "Штат"
+
+#. item "Geography/Places/State"
+#: build/trans_presets.java:2831
+msgid "Edit State"
+msgstr ""
+
+#. item "Geography/Places/State" text "Name"
+#: build/trans_presets.java:2836
+msgid "Region"
+msgstr "Область"
+
+#. item "Geography/Places/Region"
+#: build/trans_presets.java:2837
+msgid "Edit Region"
+msgstr ""
+
+#. item "Geography/Places/Region" text "Name"
+#: build/trans_presets.java:2842
+msgid "County"
+msgstr "Район"
+
+#. item "Geography/Places/County"
+#: build/trans_presets.java:2843
+msgid "Edit County"
+msgstr ""
+
+#. item "Geography/Places/County" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2849
+msgid "City"
+msgstr "Місто (понад 100 000)"
+
+#. item "Geography/Places/City"
+#: build/trans_presets.java:2850
+msgid "Edit City"
+msgstr ""
+
+#. item "Geography/Places/City" text "Name"
+#: build/trans_presets.java:2855
+msgid "Town"
+msgstr "Місто"
+
+#. item "Geography/Places/Town"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
+#: build/trans_presets.java:2857
+msgid "Edit Town"
+msgstr ""
+
+#. item "Geography/Places/Town" text "Name"
+#: build/trans_presets.java:2862
+msgid "Suburb"
+msgstr "Передмістя"
+
+#. item "Geography/Places/Suburb"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
+#: build/trans_presets.java:2864
+msgid "Edit Suburb"
+msgstr ""
+
+#. item "Geography/Places/Suburb" text "Name"
+#: build/trans_presets.java:2869
+msgid "Village"
+msgstr "Село"
+
+#. item "Geography/Places/Village"
+#: build/trans_presets.java:2870
+msgid "Edit Village"
+msgstr ""
+
+#. item "Geography/Places/Village" text "Name"
+#: build/trans_presets.java:2875
+msgid "Hamlet"
+msgstr "Хутір"
+
+#. item "Geography/Places/Hamlet"
+#: build/trans_presets.java:2876
+msgid "Edit Hamlet"
+msgstr ""
+
+#. item "Geography/Places/Hamlet" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2882
+msgid "Locality"
+msgstr "Місцевість"
+
+#. item "Geography/Places/Locality"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
+#: build/trans_presets.java:2884
+msgid "Edit Locality"
+msgstr ""
+
+#. item "Geography/Places/Locality" text "Name"
+#: build/trans_presets.java:2889
+msgid "Island"
+msgstr "Острів"
+
+#. item "Geography/Places/Island"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
+#: build/trans_presets.java:2891
+msgid "Edit Island"
+msgstr ""
+
+#. item "Geography/Places/Island" text "Name"
+#: build/trans_presets.java:2896
+msgid "Islet"
+msgstr "Острівець"
+
+#. item "Geography/Places/Islet"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
+#: build/trans_presets.java:2898
+msgid "Edit Islet"
+msgstr ""
+
+#. item "Geography/Places/Islet" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2904
+msgid "Cave Entrance"
+msgstr ""
+
+#. item "Geography/Places/Cave Entrance"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
+#: build/trans_presets.java:2906
+msgid "Edit Cave Entrance"
+msgstr ""
+
+#. item "Geography/Places/Cave Entrance" text "Name"
+#: build/trans_presets.java:2910
+msgid "Peak"
+msgstr "Вершина"
+
+#. item "Geography/Places/Peak"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
+#: build/trans_presets.java:2912
+msgid "Edit Peak"
+msgstr ""
+
+#. item "Geography/Places/Peak" text "Elevation"
+#: build/trans_presets.java:2917
+msgid "Glacier"
+msgstr ""
+
+#. item "Geography/Places/Glacier"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
+#: build/trans_presets.java:2919
+msgid "Edit Glacier"
+msgstr ""
+
+#. item "Geography/Places/Glacier" text "Elevation"
+#: build/trans_presets.java:2924
+msgid "Volcano"
+msgstr "Вулкан"
+
+#. item "Geography/Places/Volcano"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:2926
+msgid "Edit Volcano"
+msgstr ""
+
+#. item "Geography/Places/Volcano" text "Elevation"
+#: build/trans_presets.java:2932
+msgid "Boundaries"
+msgstr "Кордони"
+
+#. group "Boundaries"
+#: build/trans_presets.java:2933
+msgid "National"
+msgstr ""
+
+#. item "Boundaries/National"
+#: build/trans_presets.java:2934
+msgid "Edit National Boundary"
+msgstr ""
+
+#. item "Boundaries/National" text "Name"
+#: build/trans_presets.java:2939
+msgid "Administrative"
+msgstr "Адміністративна"
+
+#. item "Boundaries/Administrative"
+#: build/trans_presets.java:2940
+msgid "Edit Administrative Boundary"
+msgstr ""
+
+#. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2945
+msgid "Civil"
+msgstr ""
+
+#. item "Boundaries/Civil"
+#: build/trans_presets.java:2946
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2951
+msgid "Political"
+msgstr ""
+
+#. item "Boundaries/Political"
+#: build/trans_presets.java:2952
+msgid "Edit Political Boundary"
+msgstr ""
+
+#. item "Boundaries/Political" text "Name"
+#: build/trans_presets.java:2957
+msgid "National park"
+msgstr ""
+
+#. item "Boundaries/National park"
+#: build/trans_presets.java:2958
+msgid "Edit National Park Boundary"
+msgstr ""
+
+#. item "Boundaries/National park" text "Name"
+#: build/trans_presets.java:2964
+msgid "Land use"
+msgstr ""
+
+#. group "Land use"
+#: build/trans_presets.java:2965
+msgid "Tree"
+msgstr "Дерево"
+
+#. item "Land use/Tree"
+#. <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:2968
+msgid "Edit Tree"
+msgstr ""
+
+#. item "Land use/Tree" text "Height"
+#: build/trans_presets.java:2973
+msgid "Botanical Name"
+msgstr ""
+
+#. item "Land use/Tree" text "Botanical Name"
+#: build/trans_presets.java:2975
+msgid "Wood"
+msgstr "Ліс"
+
+#. item "Land use/Wood"
+#. <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:2978
+msgid "Edit Wood"
+msgstr ""
+
+#. item "Land use/Wood" combo "Type"
+#. item "Land use/Forest" combo "Type"
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
+msgid "coniferous"
+msgstr ""
+
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
+msgid "deciduous"
+msgstr ""
+
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
+msgid "mixed"
+msgstr ""
+
+#: build/trans_presets.java:2983
+msgid "Forest"
+msgstr ""
+
+#. item "Land use/Forest"
+#. <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:2986
+msgid "Edit Forest Landuse"
+msgstr ""
+
+#: build/trans_presets.java:2992
+msgid "Nature Reserve"
+msgstr ""
+
+#. item "Land use/Nature Reserve"
+#: build/trans_presets.java:2993
+msgid "Edit Nature Reserve"
+msgstr ""
+
+#. item "Land use/Nature Reserve" text "Name"
+#. <separator/>
+#: build/trans_presets.java:2998
+msgid "Scree"
+msgstr ""
+
+#. item "Land use/Scree"
+#: build/trans_presets.java:2999
+msgid "Edit Scree"
+msgstr ""
+
+#. item "Land use/Scree" text "Name"
+#: build/trans_presets.java:3003
+msgid "Scrub"
+msgstr ""
+
+#. item "Land use/Scrub"
+#: build/trans_presets.java:3004
+msgid "Edit Scrub"
+msgstr ""
+
+#. item "Land use/Scrub" text "Name"
+#: build/trans_presets.java:3008
+msgid "Fell"
+msgstr ""
+
+#. item "Land use/Fell"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
+#: build/trans_presets.java:3010
+msgid "Edit Fell"
+msgstr ""
+
+#. item "Land use/Fell" text "Name"
+#: build/trans_presets.java:3014
+msgid "Heath"
+msgstr ""
+
+#. item "Land use/Heath"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
+#: build/trans_presets.java:3016
+msgid "Edit Heath"
+msgstr ""
+
+#. item "Land use/Heath" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3021
+msgid "Farmyard"
+msgstr ""
+
+#. item "Land use/Farmyard"
+#. <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:3024
+msgid "Edit Farmyard Landuse"
+msgstr ""
+
+#. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:3029
+msgid "Farmland"
+msgstr "Сільськогосподарські угіддя"
+
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3030
+msgid "Edit Farmland Landuse"
+msgstr ""
+
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:3035
+msgid "Meadow"
+msgstr "Левада"
+
+#. item "Land use/Meadow"
+#: build/trans_presets.java:3036
+msgid "Edit Meadow Landuse"
+msgstr ""
+
+#. item "Land use/Meadow" text "Name"
+#: build/trans_presets.java:3041
+msgid "Vineyard"
+msgstr "Виноградник"
+
+#. item "Land use/Vineyard"
+#: build/trans_presets.java:3042
+msgid "Edit Vineyard Landuse"
+msgstr ""
+
+#. item "Land use/Vineyard" text "Name"
+#: build/trans_presets.java:3047
+msgid "Allotments"
+msgstr "Горо́д"
+
+#. item "Land use/Allotments"
+#: build/trans_presets.java:3048
+msgid "Edit Allotments Landuse"
+msgstr ""
+
+#. item "Land use/Allotments" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3054
+msgid "Garden"
+msgstr "Сад"
+
+#. item "Land use/Garden"
+#: build/trans_presets.java:3055
+msgid "Edit Garden"
+msgstr ""
+
+#. item "Land use/Garden" text "Name"
+#: build/trans_presets.java:3059
+msgid "Grass"
+msgstr "Газон"
+
+#. item "Land use/Grass"
+#: build/trans_presets.java:3060
+msgid "Edit Grass Landuse"
+msgstr ""
+
+#. item "Land use/Grass" text "Name"
+#: build/trans_presets.java:3065
+msgid "Village Green"
+msgstr ""
+
+#. item "Land use/Village Green"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
+#: build/trans_presets.java:3067
+msgid "Edit Village Green Landuse"
+msgstr ""
+
+#. item "Land use/Village Green" text "Name"
+#: build/trans_presets.java:3072
+msgid "Common"
+msgstr ""
+
+#. item "Land use/Common"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
+#: build/trans_presets.java:3074
+msgid "Edit Common"
+msgstr ""
+
+#. item "Land use/Common" text "Name"
+#: build/trans_presets.java:3078
+msgid "Park"
+msgstr "Парк"
+
+#. item "Land use/Park"
+#: build/trans_presets.java:3079
+msgid "Edit Park"
+msgstr ""
+
+#. item "Land use/Park" text "Name"
+#: build/trans_presets.java:3083
+msgid "Recreation Ground"
+msgstr ""
+
+#. item "Land use/Recreation Ground"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
+#: build/trans_presets.java:3085
+msgid "Edit Recreation Ground Landuse"
+msgstr ""
+
+#. item "Land use/Recreation Ground" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3091
+msgid "Residential area"
+msgstr ""
+
+#. item "Land use/Residential area"
+#: build/trans_presets.java:3092
+msgid "Edit Residential Landuse"
+msgstr ""
+
+#. item "Land use/Residential area" text "Name"
+#: build/trans_presets.java:3097
+msgid "Graveyard"
+msgstr "Цвинтар"
+
+#. item "Land use/Graveyard"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
+#: build/trans_presets.java:3099
+msgid "Edit Graveyard"
+msgstr ""
+
+#: build/trans_presets.java:3105
+msgid "Cemetery"
+msgstr "Кладовище"
+
+#. item "Land use/Cemetery"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:3107
+msgid "Edit Cemetery Landuse"
+msgstr ""
+
+#: build/trans_presets.java:3114
+msgid "Retail"
+msgstr "Роздрібна торгівля"
+
+#. item "Land use/Retail"
+#: build/trans_presets.java:3115
+msgid "Edit Retail Landuse"
+msgstr ""
+
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:3120
+msgid "Commercial"
+msgstr ""
+
+#. item "Land use/Commercial"
+#: build/trans_presets.java:3121
+msgid "Edit Commercial Landuse"
+msgstr ""
+
+#. item "Land use/Commercial" text "Name"
+#: build/trans_presets.java:3126
+msgid "Industrial"
+msgstr "Промзона"
+
+#. item "Land use/Industrial"
+#: build/trans_presets.java:3127
+msgid "Edit Industrial Landuse"
+msgstr ""
+
+#. item "Land use/Industrial" text "Name"
+#: build/trans_presets.java:3132
+msgid "Railway land"
+msgstr ""
+
+#. item "Land use/Railway land"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
+#: build/trans_presets.java:3134
+msgid "Edit Railway Landuse"
+msgstr ""
+
+#. item "Land use/Railway land" text "Name"
+#: build/trans_presets.java:3139
+msgid "Military"
+msgstr ""
+
+#. item "Land use/Military"
+#: build/trans_presets.java:3140
+msgid "Edit Military Landuse"
+msgstr ""
+
+#. item "Land use/Military" text "Name"
+#. <separator/>
+#: build/trans_presets.java:3146
+msgid "Construction area"
+msgstr ""
+
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3147
+msgid "Edit Construction Landuse"
+msgstr ""
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr "Очищене місце під забудову"
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3153
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr "Ділянка під нову забудову"
+
+#. item "Land use/Greenfield"
+#: build/trans_presets.java:3159
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:3164
+msgid "Landfill"
+msgstr "Звалище"
+
+#. item "Land use/Landfill"
+#: build/trans_presets.java:3165
+msgid "Edit Landfill Landuse"
+msgstr ""
+
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:3170
+msgid "Quarry"
+msgstr "Кар’єр"
+
+#. item "Land use/Quarry"
+#: build/trans_presets.java:3171
+msgid "Edit Quarry Landuse"
+msgstr ""
+
+#. item "Relations/Multipolygon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:multipolygon"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
+#. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
+#: build/trans_presets.java:3184
+msgid "Edit Multipolygon"
+msgstr ""
+
+#. item "Relations/Multipolygon" text "Name"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:3190
+msgid "outer segment"
+msgstr ""
+
+#. item "Relations/Multipolygon" role "outer segment"
+#: build/trans_presets.java:3191
+msgid "inner segment"
+msgstr ""
+
+#. item "Relations/Multipolygon" role "inner segment"
+#. </roles>
+#: build/trans_presets.java:3194
+msgid "Turn restriction"
+msgstr ""
+
+#. item "Relations/Turn restriction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
+#: build/trans_presets.java:3197
+msgid "Edit Turn Restriction"
+msgstr ""
+
+#. item "Relations/Turn restriction" label "Edit Turn Restriction"
+#. <key key="type" value="restriction" />
+#: build/trans_presets.java:3199
+msgid "Restriction"
+msgstr ""
+
+#. item "Relations/Turn restriction" combo "Restriction"
+#: build/trans_presets.java:3199
+msgid "no_left_turn"
+msgstr ""
+
+#: build/trans_presets.java:3199
+msgid "no_right_turn"
+msgstr ""
+
+#: build/trans_presets.java:3199
+msgid "no_straight_on"
+msgstr ""
+
+#: build/trans_presets.java:3199
+msgid "no_u_turn"
+msgstr ""
+
+#: build/trans_presets.java:3199
+msgid "only_right_turn"
+msgstr ""
+
+#: build/trans_presets.java:3199
+msgid "only_left_turn"
+msgstr ""
+
+#: build/trans_presets.java:3199
+msgid "only_straight_on"
+msgstr ""
+
+#. item "Relations/Turn restriction" text "Name"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:3204
+msgid "from way"
+msgstr ""
+
+#. item "Relations/Turn restriction" role "from way"
+#: build/trans_presets.java:3205
+msgid "via node or way"
+msgstr ""
+
+#. item "Relations/Turn restriction" role "via node or way"
+#: build/trans_presets.java:3206
+msgid "to way"
+msgstr ""
+
+#. item "Relations/Turn restriction" role "to way"
+#. </roles>
+#: build/trans_presets.java:3209
+msgid "Route"
+msgstr "Маршрут"
+
+#. item "Relations/Route"
+#. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
+#: build/trans_presets.java:3212
+msgid "Edit Route"
+msgstr ""
+
+#. item "Relations/Route" label "Edit Route"
+#. <key key="type" value="route" />
+#: build/trans_presets.java:3214
+msgid "Route type"
+msgstr ""
+
+#. item "Relations/Route" combo "Route type"
+#. color destination
+#. <icon annotate="true" src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="bicycle" b="no"/>
+#. <icon src="vehicle/restriction/bicycle.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bicycle" v="designated"/>
+#. color horse
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="cycleway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <!-- display path with bicycle/foot=designated as if it was cycleway/footway -->
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. color foot
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="bicycle" v="designated"/>
+#. <condition k="foot" v="designated"/>
+#. color roundabout
+#. <!-- tagging a node makes no real sense, a roundabout should be tagged with several nodes, or a highway=mini_roundabout should probably be used -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- cycleway tags -->
+#.
+#. <rule>
+#. <condition k="cycleway" v="lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_lane"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite_track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="cycleway" v="opposite"/>
+#: build/trans_presets.java:3214 build/trans_style.java:233
+#: build/trans_style.java:689 build/trans_style.java:715
+#: build/trans_style.java:732 build/trans_style.java:909
+#: build/trans_style.java:917 build/trans_style.java:925
+#: build/trans_style.java:933 build/trans_style.java:941
+msgid "bicycle"
+msgstr "велосипедний"
+
+#: build/trans_presets.java:3214
+msgid "bus"
+msgstr "автобусний"
+
+#: build/trans_presets.java:3214
+msgid "road"
+msgstr "дорога"
+
+#: build/trans_presets.java:3214
+msgid "ferry"
+msgstr ""
+
+#: build/trans_presets.java:3214
+msgid "ski"
+msgstr ""
+
+#. color bicycle
+#. <icon annotate="true" src="vehicle/restriction/bicycle-designated.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="foot" b="no"/>
+#. <icon src="vehicle/restriction/foot.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="footway"/>
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="path"/>
+#. <condition k="foot" v="designated"/>
+#. color bicycle
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="pedestrian"/>
+#. color foot
+#. color foot
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="steps"/>
+#: build/trans_presets.java:3214 build/trans_style.java:247
+#: build/trans_style.java:697 build/trans_style.java:705
+#: build/trans_style.java:723 build/trans_style.java:739
+#: build/trans_style.java:740 build/trans_style.java:748
+msgid "foot"
+msgstr ""
+
+#: build/trans_presets.java:3214
+msgid "tram"
+msgstr ""
+
+#: build/trans_presets.java:3214
+msgid "detour"
+msgstr ""
+
+#. color otherrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="subway"/>
+#: build/trans_presets.java:3214 build/trans_style.java:1208
+msgid "subway"
+msgstr ""
+
+#. item "Relations/Route" text "Reference"
+#: build/trans_presets.java:3217
+msgid "Symbol description"
+msgstr ""
+
+#. item "Relations/Route" text "Description"
+#. <optional>
+#: build/trans_presets.java:3220
+msgid "Network"
+msgstr "Мережа"
+
+#. item "Relations/Route" text "Operator"
+#: build/trans_presets.java:3222
+msgid "Route state"
+msgstr ""
+
+#. item "Relations/Route" combo "Route state"
+#: build/trans_presets.java:3222
+msgid "proposed"
+msgstr ""
+
+#: build/trans_presets.java:3222
+msgid "alternate"
+msgstr "альтернативний"
+
+#: build/trans_presets.java:3222
+msgid "temporary"
+msgstr ""
+
+#: build/trans_presets.java:3222
+msgid "connection"
+msgstr ""
+
+#: build/trans_presets.java:3223
+msgid "Color (hex)"
+msgstr ""
+
+#. item "Relations/Route" text "Color (hex)"
+#. </optional>
+#. <roles>
+#: build/trans_presets.java:3226
+msgid "route segment"
+msgstr ""
+
+#. item "Relations/Route" role "route segment"
+#: build/trans_presets.java:3227
+msgid "forward segment"
+msgstr ""
+
+#. item "Relations/Route" role "forward segment"
+#: build/trans_presets.java:3228
+msgid "backward segment"
+msgstr ""
+
+#. item "Relations/Route" role "backward segment"
+#: build/trans_presets.java:3229
+msgid "halt point"
+msgstr ""
+
+#. item "Relations/Route" role "halt point"
+#: build/trans_presets.java:3230
+msgid "forward halt point"
+msgstr ""
+
+#. item "Relations/Route" role "forward halt point"
+#: build/trans_presets.java:3231
+msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. mappaint style named "standard"
+#.
+#. <rule>
+#. <condition k="restriction" v="no_left_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_left_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_left_turn.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_right_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_right_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_right_turn.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_straight_on"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_straight_on.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_straight_on.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="no_u_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/no_u_turn.png"/>
+#. <!--icon annotate="true" src="vehicle/restriction/turn_restrictions/ireland/no_u_turn.png"/-->
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_left_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_left_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_right_turn"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_right_turn.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="restriction" v="only_straight_on"/>
+#. <icon annotate="true" src="vehicle/restriction/turn_restrictions/only_straight_on.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#.
+#. <!-- mark some specials that should be fixed - they are already the default and therefore shouldn't be tagged -->
+#. <rule>
+#. <condition k="oneway"/>
+#. <!-- no line or area, as this is a highway=xy, railway=xy, .... -->
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" b="yes"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="viaduct"/>
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="aqueduct"/>
+#. color bridge
+#. <icon annotate="true" src="nautical/aqueduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" v="swing"/>
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="tunnel" b="yes"/>
+#: build/trans_style.java:132 build/trans_style.java:146
+#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:167
+msgid "bridge"
+msgstr "міст"
+
+#. color bridge
+#. <icon annotate="true" src="vehicle/viaduct.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="bridge" b="no"/>
+#. color bridge
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="tunnel" b="no"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="cutting" b="no"/>
+#. color deprecated
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="embankment" b="no"/>
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="road"/>
+#. color sport
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--abutters tags -->
+#.
+#. <!--accessories tags -->
+#.
+#. <!--properties tags -->
+#.
+#. <rule>
+#. <condition k="mountain_pass" b="yes"/>
+#: build/trans_style.java:139 build/trans_style.java:174
+#: build/trans_style.java:181 build/trans_style.java:188
+#: build/trans_style.java:633 build/trans_style.java:4087
+msgid "deprecated"
+msgstr ""
+
+#. color foot
+#. <icon annotate="true" src="vehicle/restriction/foot-designated.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>10000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="goods" b="no"/>
+#. <icon src="vehicle/restriction/goods.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="hgv" b="no"/>
+#. <icon src="vehicle/restriction/goods.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="horse" b="no"/>
+#. <icon src="vehicle/restriction/horse.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="horse" v="designated"/>
+#. color service
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>20000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bridleway"/>
+#: build/trans_style.java:275 build/trans_style.java:681
+msgid "horse"
+msgstr "кінь"
+
+#. color horse
+#. <icon src="vehicle/restriction/horse-designated.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcycle" b="no"/>
+#. <icon src="vehicle/restriction/motorbike.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorcar" b="no"/>
+#. <icon src="vehicle/restriction/motorcar.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="psv" b="no"/>
+#. <icon src="vehicle/restriction/psv.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="motorboat" b="no"/>
+#. <icon src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boat" b="no"/>
+#. <icon src="misc/no_icon.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="noexit" b="yes"/>
+#. <icon src="vehicle/restriction/dead_end.png" priority="-100"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxweight"/>
+#. <icon src="vehicle/restriction/maxweight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxheight"/>
+#. <icon src="vehicle/restriction/maxheight.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxwidth"/>
+#. <icon src="vehicle/restriction/maxwidth.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxlength"/>
+#. <icon src="vehicle/restriction/maxlength.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxspeed"/>
+#. <icon src="vehicle/restriction/speed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="minspeed"/>
+#. <icon src="vehicle/restriction/minspeed.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="maxstay"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="toll"/>
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="barrier"/>
+#. <icon annotate="true" src="vehicle/restriction/barrier.png" priority="-10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bollard"/>
+#. <icon annotate="true" src="vehicle/restriction/bollard.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="gate"/>
+#. <icon annotate="true" src="vehicle/gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hedge"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="stile"/>
+#. <icon annotate="true" src="vehicle/stile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="turnstile"/>
+#. <icon annotate="true" src="vehicle/turnstile.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="fence"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cycle_barrier"/>
+#. <icon annotate="true" src="vehicle/cycle_barrier.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="lift_gate"/>
+#. <icon annotate="true" src="vehicle/lift_gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="toll_booth"/>
+#. <icon annotate="true" src="vehicle/toll_booth.png"/>
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="kissing_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="city_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="entrance"/>
+#. <icon annotate="true" src="vehicle/entrance.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="retaining_wall"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. color barrier
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="cattle_grid"/>
+#. <icon annotate="true" src="vehicle/cattle_grid.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="block"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color barrier
+#: build/trans_style.java:388 build/trans_style.java:401
+#: build/trans_style.java:402 build/trans_style.java:421
+#: build/trans_style.java:422 build/trans_style.java:441
+#: build/trans_style.java:442 build/trans_style.java:449
+#: build/trans_style.java:462 build/trans_style.java:463
+#: build/trans_style.java:476 build/trans_style.java:477
+#: build/trans_style.java:490 build/trans_style.java:491
+msgid "barrier"
+msgstr ""
+
+#. color barrier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="border_control"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bump_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="sally_port"/>
+#. <icon annotate="true" src="vehicle/sally_port.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="portcullis"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="spikes"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="bus_trap"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="drawbridge"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="barrier" v="hampshire_gate"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- highway tags -->
+#.
+#. <rule>
+#. <condition k="motorroad" v="yes"/>
+#: build/trans_style.java:548
+msgid "motorroad"
+msgstr ""
+
+#. color street
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="track"/>
+#. color bicycle
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- tracktype tags -->
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade1"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade2"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade3"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade4"/>
+#. color highway_track
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tracktype" v="grade5"/>
+#: build/trans_style.java:649 build/trans_style.java:951
+#: build/trans_style.java:959 build/trans_style.java:967
+#: build/trans_style.java:975 build/trans_style.java:983
+msgid "highway_track"
+msgstr ""
+
+#. 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>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="motorway_junction"/>
+#. <icon annotate="true" src="vehicle/exit.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="services"/>
+#: build/trans_style.java:842
+msgid "services"
+msgstr ""
+
+#. color services
+#. <icon annotate="true" src="vehicle/services.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="ford"/>
+#: build/trans_style.java:850
+msgid "ford"
+msgstr ""
+
+#. color ford
+#. <icon annotate="true" src="vehicle/ford.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="bus_stop"/>
+#. <icon annotate="true" src="transport/bus_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="turning_circle"/>
+#: build/trans_style.java:865
+msgid "turningcircle"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png" priority="10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="highway" v="emergency_access_point"/>
+#. <icon src="service/emergency_access_point.png"/>
+#: build/trans_style.java:889
+msgid "emergency_access_point"
+msgstr ""
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="riverbank"/>
+#. color riverbank
+#: build/trans_style.java:1001 build/trans_style.java:1002
+msgid "riverbank"
+msgstr ""
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="stream"/>
+#: build/trans_style.java:1018
+msgid "stream"
+msgstr "струмок"
+
+#. color water
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="dock"/>
+#: build/trans_style.java:1041
+msgid "dock"
+msgstr "док"
+
+#. color dock
+#. <icon annotate="true" src="nautical/boatyard.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="lock_gate"/>
+#. <icon annotate="true" src="nautical/lock_gate.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <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="boatyard"/>
+#. <icon annotate="true" src="nautical/boatyard.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="water_point"/>
+#. <icon annotate="true" src="accommodation/camping/water.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="waste_disposal"/>
+#. <icon annotate="true" src="accommodation/camping/wastewater.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="mooring"/>
+#. <icon annotate="true" src="nautical/marina.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="weir"/>
+#. <icon annotate="true" src="nautical/weir.png"/>
+#. color rapids
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="dam"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color manmade
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="waterfall"/>
+#. <icon annotate="true" src="nautical/waterfall.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--man_made tags -->
+#.
+#. <rule>
+#. <condition k="man_made" v="beacon"/>
+#. <icon annotate="true" src="misc/landmark/beacon.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="crane"/>
+#. color manmade
+#. <icon annotate="true" src="misc/landmark/crane.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="gasometer"/>
+#. <icon annotate="true" src="misc/landmark/gasometer.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="lighthouse"/>
+#. <icon annotate="true" src="misc/landmark/lighthouse.png"/>
+#. color pipeline
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <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"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="surveillance"/>
+#. <icon annotate="true" src="misc/surveillance.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="survey_point"/>
+#. <icon annotate="true" src="misc/landmark/survey_point.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="tower"/>
+#. <icon annotate="true" src="misc/landmark/tower.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="wastewater_plant"/>
+#. color manmade
+#. <icon annotate="true" src="misc/landmark/wastewater_plant.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="watermill"/>
+#. <icon annotate="true" src="misc/landmark/watermill.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="water_tower"/>
+#. <icon annotate="true" src="misc/landmark/water_tower.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="windmill"/>
+#. <icon annotate="true" src="misc/landmark/windmill.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="works"/>
+#. <icon annotate="true" src="misc/landmark/works.png"/>
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="water_works"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1064 build/trans_style.java:1093
+#: build/trans_style.java:1109 build/trans_style.java:1110
+#: build/trans_style.java:1118 build/trans_style.java:1603
+#: build/trans_style.java:1610 build/trans_style.java:1619
+#: build/trans_style.java:1627 build/trans_style.java:1659
+#: build/trans_style.java:1667 build/trans_style.java:1675
+#: build/trans_style.java:1683 build/trans_style.java:1690
+#: build/trans_style.java:1699 build/trans_style.java:1707
+#: build/trans_style.java:1715 build/trans_style.java:1723
+#: build/trans_style.java:1731
+msgid "manmade"
+msgstr ""
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="waterway" v="rapids"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#: build/trans_style.java:1101
+msgid "rapids"
+msgstr ""
+
+#. color manmade
+#. <!-- it's not possible to have both line and area, line seems more likely -->
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- railway tags -->
+#.
+#. <rule>
+#. <condition k="railway" v="station"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/railway_station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="halt"/>
+#. <icon annotate="true" src="transport/railway_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram_station"/>
+#. color railwaypoint
+#. <icon annotate="true" src="transport/railway_station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram_stop"/>
+#. <icon annotate="true" src="transport/railway_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="subway_entrance"/>
+#. 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="crossing"/>
+#. color railwaypoint
+#. <icon annotate="true" src="vehicle/crossing_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="level_crossing"/>
+#: build/trans_style.java:1128 build/trans_style.java:1143
+#: build/trans_style.java:1158 build/trans_style.java:1166
+#: build/trans_style.java:1174
+msgid "railwaypoint"
+msgstr ""
+
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="tram"/>
+#. <!-- prefer way types over tram - draw tram as overlay in joined cases -->
+#. color railover
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="light_rail"/>
+#: build/trans_style.java:1191 build/trans_style.java:1200
+msgid "otherrail"
+msgstr ""
+
+#. color otherrail
+#: build/trans_style.java:1192
+msgid "railover"
+msgstr ""
+
+#. color subway
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="railway" v="preserved"/>
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- disused often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
+#. <rule>
+#. <condition k="railway" v="disused"/>
+#. color oldrail
+#. color oldrail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- abandoned often appears together with highway=xy -->
+#. <!-- -> normal display with line, linemod for combinations -->
+#. <rule>
+#. <condition k="railway" v="abandoned"/>
+#. color oldrail
+#: build/trans_style.java:1216 build/trans_style.java:1226
+#: build/trans_style.java:1227 build/trans_style.java:1237
+#: build/trans_style.java:1238
+msgid "oldrail"
+msgstr ""
+
+#. color rail
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="yard"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="siding"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="service" v="spur"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--aeroway tags -->
+#.
+#. <rule>
+#. <condition k="aeroway" v="aerodrome"/>
+#. color aeroway
+#. color aeroway_dark
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="taxiway"/>
+#: build/trans_style.java:1318 build/trans_style.java:1319
+#: build/trans_style.java:1351
+msgid "aeroway"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="terminal"/>
+#: build/trans_style.java:1327
+msgid "terminal"
+msgstr "термінал"
+
+#. color terminal
+#. <icon annotate="true" src="transport/airport/terminal.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="helipad"/>
+#. color aeroway_dark
+#. <icon annotate="true" src="transport/airport/helipad.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="runway"/>
+#: build/trans_style.java:1335 build/trans_style.java:1343
+msgid "aeroway_dark"
+msgstr ""
+
+#. color aeroway
+#. <icon annotate="true" src="transport/airport.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="apron"/>
+#: build/trans_style.java:1359
+msgid "aeroway_light"
+msgstr ""
+
+#. 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>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aeroway" v="windsock"/>
+#. <icon annotate="true" src="transport/airport/windsock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--aerialway tags -->
+#.
+#. <rule>
+#. <condition k="aerialway" v="cable_car"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="gondola"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/cable_car.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="chair_lift"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/chair_lift.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="drag_lift"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/drag_lift.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="station"/>
+#. color aerialway
+#. <icon annotate="true" src="transport/aerialway/station.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="aerialway" v="pylon"/>
+#: build/trans_style.java:1383 build/trans_style.java:1391
+#: build/trans_style.java:1399 build/trans_style.java:1407
+#: build/trans_style.java:1415 build/trans_style.java:1423
+msgid "aerialway"
+msgstr ""
+
+#. color aerialway
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- piste tags -->
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="easy"/>
+#. color piste_easy
+#: build/trans_style.java:1433 build/trans_style.java:1434
+msgid "piste_easy"
+msgstr ""
+
+#. color piste_easy
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="intermediate"/>
+#. color piste_intermediate
+#: build/trans_style.java:1442 build/trans_style.java:1443
+msgid "piste_intermediate"
+msgstr ""
+
+#. color piste_intermediate
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="advanced"/>
+#. color piste_advanced
+#: build/trans_style.java:1451 build/trans_style.java:1452
+msgid "piste_advanced"
+msgstr ""
+
+#. color piste_advanced
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="expert"/>
+#. color piste_expert
+#: build/trans_style.java:1460 build/trans_style.java:1461
+msgid "piste_expert"
+msgstr ""
+
+#. color piste_expert
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="freeride"/>
+#. color piste_freeride
+#: build/trans_style.java:1469 build/trans_style.java:1470
+msgid "piste_freeride"
+msgstr ""
+
+#. color piste_freeride
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>30000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="piste:difficulty" v="novice"/>
+#. color piste_novice
+#: build/trans_style.java:1478 build/trans_style.java:1479
+msgid "piste_novice"
+msgstr ""
+
+#. color piste_novice
+#. <icon src="sport/skiing.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>300000</scale_max>
+#. </rule>
+#.
+#. <!--power tags -->
+#.
+#. <rule>
+#. <condition k="power" v="tower"/>
+#. <icon annotate="true" src="misc/landmark/power/tower_small.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="pole"/>
+#. <icon annotate="true" src="misc/landmark/power/pole.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="minor_line"/>
+#. color power
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="sub_station"/>
+#. <icon annotate="true" src="misc/landmark/power.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="wind"/>
+#. <icon annotate="true" src="misc/landmark/power/wind.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="hydro"/>
+#. <icon annotate="true" src="misc/landmark/power/hydro.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="fossil"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="coal"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="gas"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="photovoltaic"/>
+#. <icon annotate="true" src="misc/landmark/power/fossil.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power_source" v="nuclear"/>
+#. <icon annotate="true" src="misc/landmark/power/nuclear.png"/>
+#. color power
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="power" v="generator"/>
+#. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
+#: build/trans_style.java:1490 build/trans_style.java:1504
+#: build/trans_style.java:1512 build/trans_style.java:1521
+#: build/trans_style.java:1529 build/trans_style.java:1537
+#: build/trans_style.java:1545 build/trans_style.java:1553
+#: build/trans_style.java:1561 build/trans_style.java:1569
+#: build/trans_style.java:1577 build/trans_style.java:1585
+#: build/trans_style.java:1593
+msgid "power"
+msgstr ""
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="pier"/>
+#. color pier
+#: build/trans_style.java:1634 build/trans_style.java:1635
+msgid "pier"
+msgstr "пірс"
+
+#. color pier
+#. <icon annotate="true" src="nautical/pier.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="man_made" v="pipeline"/>
+#: build/trans_style.java:1643
+msgid "pipeline"
+msgstr ""
+
+#. color manmade
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--leisure tags -->
+#.
+#. <rule>
+#. <condition k="leisure" v="sports_centre"/>
+#. <icon annotate="true" src="sport/centre.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="golf_course"/>
+#. <icon annotate="true" src="sport/golf.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="stadium"/>
+#. <icon annotate="true" src="sport/stadium.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="track"/>
+#. <icon annotate="true" src="sport/track.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="pitch"/>
+#. <icon annotate="true" src="sport/pitch.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="water_park"/>
+#. <icon annotate="true" src="leisure/water_park.png"/>
+#. color marina
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="slipway"/>
+#. <icon annotate="true" src="nautical/slipway.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="fishing"/>
+#. <icon annotate="true" src="sport/fishing.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="nature_reserve"/>
+#. <icon annotate="true" src="leisure/nature_reserve.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="park"/>
+#. <icon annotate="true" src="leisure/park.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="playground"/>
+#. <icon annotate="true" src="leisure/playground.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="garden"/>
+#. <icon annotate="true" src="leisure/garden.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="common"/>
+#. <icon annotate="true" src="leisure/common.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="swimming_pool"/>
+#. <icon annotate="true" src="sport/pool.png"/>
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="miniature_golf"/>
+#. <icon annotate="true" src="sport/golf.png"/>
+#. 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:1741 build/trans_style.java:1749
+#: build/trans_style.java:1757 build/trans_style.java:1765
+#: build/trans_style.java:1773 build/trans_style.java:1781
+#: build/trans_style.java:1797 build/trans_style.java:1805
+#: build/trans_style.java:1813 build/trans_style.java:1821
+#: build/trans_style.java:1829 build/trans_style.java:1837
+#: build/trans_style.java:1845 build/trans_style.java:1853
+#: build/trans_style.java:1861 build/trans_style.java:1869
+#: build/trans_style.java:1877
+msgid "leisure"
+msgstr ""
+
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="leisure" v="marina"/>
+#. <icon annotate="true" src="nautical/marina.png"/>
+#: build/trans_style.java:1789
+msgid "marina"
+msgstr ""
+
+#. color leisure
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--amenity tags -->
+#.
+#. <rule>
+#. <condition k="amenity" v="pub"/>
+#. <icon annotate="true" src="food/pub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="biergarten"/>
+#. <icon annotate="true" src="food/biergarten.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="nightclub"/>
+#. <icon annotate="true" src="leisure/nightclub.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <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"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="restaurant"/>
+#. <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="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"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bar"/>
+#. <icon annotate="true" src="food/bar.png"/>
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="ice_cream"/>
+#. <icon annotate="true" src="food/icecream.png"/>
+#: build/trans_style.java:1887 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:1967
+msgid "amenity"
+msgstr ""
+
+#. color amenity
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="multi-storey"/>
+#. <icon annotate="true" src="vehicle/parking/multi-storey.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="underground"/>
+#. <icon annotate="true" src="vehicle/parking/underground.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="park_and_ride"/>
+#. <icon annotate="true" src="vehicle/parking/park_ride.png" priority="10000"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="parking" v="surface"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="parking"/>
+#. <icon annotate="true" src="vehicle/parking.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bicycle_parking"/>
+#. <icon annotate="true" src="vehicle/parking/bicycle.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bicycle_rental"/>
+#. <icon annotate="true" src="vehicle/rental/bicycle.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_rental"/>
+#. <icon annotate="true" src="vehicle/rental/car.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_sharing"/>
+#. <icon annotate="true" src="vehicle/car_sharing.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="car_wash"/>
+#. color amenity_traffic
+#. <icon annotate="true" src="vehicle/car_wash.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="taxi"/>
+#. <icon annotate="true" src="transport/taxi.png"/>
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fuel"/>
+#. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
+#: build/trans_style.java:1975 build/trans_style.java:1983
+#: build/trans_style.java:1991 build/trans_style.java:1999
+#: build/trans_style.java:2007 build/trans_style.java:2015
+#: build/trans_style.java:2023 build/trans_style.java:2031
+#: build/trans_style.java:2039 build/trans_style.java:2046
+#: build/trans_style.java:2055 build/trans_style.java:2063
+msgid "amenity_traffic"
+msgstr ""
+
+#. color amenity_traffic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grit_bin"/>
+#. <icon annotate="true" src="misc/grit_bin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="telephone"/>
+#. <icon annotate="true" src="service/telephone.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="clock"/>
+#. <icon annotate="true" src="service/clock.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="emergency_phone"/>
+#. <icon annotate="true" src="vehicle/emergency_phone.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="toilets"/>
+#. <icon annotate="true" src="service/toilets.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="recycling"/>
+#. <icon annotate="true" src="service/recycling.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="waste_basket"/>
+#. <icon annotate="true" src="service/recycling/trash-bin.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="public_building"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="embassy"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="townhall"/>
+#. <icon annotate="true" src="service.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="community_centre"/>
+#. <icon annotate="true" src="service.png"/>
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="bahai"/>
+#. <icon annotate="true" src="religion/bahai.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="buddhist"/>
+#. <icon annotate="true" src="religion/buddhism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="christian"/>
+#. <icon annotate="true" src="religion/church.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="hindu"/>
+#. <icon annotate="true" src="religion/hinduism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="jain"/>
+#. <icon annotate="true" src="religion/jainism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="jewish"/>
+#. <icon annotate="true" src="religion/jewish.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="muslim"/>
+#. <icon annotate="true" src="religion/muslim.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="sikh"/>
+#. <icon annotate="true" src="religion/sikhism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="shinto"/>
+#. <icon annotate="true" src="religion/shinto.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="spiritualist"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="taoist"/>
+#. <icon annotate="true" src="religion/taoism.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="unitarian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="religion" v="zoroastrian"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="place_of_worship"/>
+#. <icon annotate="true" src="religion.png" priority="-10000"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="grave_yard"/>
+#. <icon annotate="true" src="rendering/landuse/cemetery.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="crematorium"/>
+#. 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="post_office"/>
+#. <icon annotate="true" src="service/post_office.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="post_box"/>
+#. <icon annotate="true" src="service/post_box.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="school"/>
+#. <icon annotate="true" src="education/school.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="university"/>
+#. <icon annotate="true" src="education/university.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="college"/>
+#. <icon annotate="true" src="education/college.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="kindergarten"/>
+#. <icon annotate="true" src="education/kindergarten.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="driving_school"/>
+#. <icon annotate="true" src="education/driving_school.png"/>
+#. color health
+#. <icon annotate="true" src="health/veterinary.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="library"/>
+#. color amenity_light
+#. <icon annotate="true" src="shop/rental/library.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="police"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/police.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fire_station"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/firebrigade.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bus_station"/>
+#. <icon annotate="true" src="transport/bus.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="ferry_terminal"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="theatre"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/theater.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="cinema"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/cinema.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="arts_centre"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/arts_centre.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="courthouse"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/administration/court_of_law.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="prison"/>
+#. color amenity_light
+#. <icon annotate="true" src="service/administration/prison.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bank"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/bank.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bureau_de_change"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/exchange.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="atm"/>
+#. color amenity_light
+#. <icon annotate="true" src="money/atm.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bench"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bench.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="bbq"/>
+#. color amenity_light
+#. <icon annotate="true" src="leisure/bbq.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="shelter"/>
+#. color amenity_light
+#. <icon annotate="true" src="accommodation/shelter.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="hunting_stand"/>
+#. color amenity_light
+#. <icon annotate="true" src="hunting_stand.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="marketplace"/>
+#. color amenity_light
+#. <icon annotate="true" src="place/marketplace.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="wlan"/>
+#. <icon annotate="true" src="wlan.png"/>
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="vending" v="excrement_bags"/>
+#. <icon annotate="true" src="service/excrement_bags.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="vending_machine"/>
+#. <icon src="transport/ticket-machine.png" priority="-10"/>
+#: build/trans_style.java:2078 build/trans_style.java:2093
+#: build/trans_style.java:2101 build/trans_style.java:2109
+#: build/trans_style.java:2124 build/trans_style.java:2132
+#: build/trans_style.java:2140 build/trans_style.java:2148
+#: build/trans_style.java:2263 build/trans_style.java:2271
+#: build/trans_style.java:2278 build/trans_style.java:2287
+#: build/trans_style.java:2295 build/trans_style.java:2303
+#: build/trans_style.java:2311 build/trans_style.java:2319
+#: build/trans_style.java:2327 build/trans_style.java:2335
+#: build/trans_style.java:2398 build/trans_style.java:2406
+#: build/trans_style.java:2414 build/trans_style.java:2423
+#: build/trans_style.java:2431 build/trans_style.java:2438
+#: build/trans_style.java:2446 build/trans_style.java:2454
+#: build/trans_style.java:2462 build/trans_style.java:2470
+#: build/trans_style.java:2478 build/trans_style.java:2486
+#: build/trans_style.java:2494 build/trans_style.java:2502
+#: build/trans_style.java:2510 build/trans_style.java:2518
+#: build/trans_style.java:2526 build/trans_style.java:2534
+#: build/trans_style.java:2543 build/trans_style.java:2558
+msgid "amenity_light"
+msgstr ""
+
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="drinking_water"/>
+#. <icon annotate="true" src="food/drinking_water.png"/>
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="fountain"/>
+#. <icon annotate="true" src="misc/landmark/spring.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--natural tags -->
+#.
+#. <rule>
+#. <condition k="natural" v="spring"/>
+#. <icon annotate="true" src="misc/landmark/spring.png"/>
+#: build/trans_style.java:2156 build/trans_style.java:2164
+#: build/trans_style.java:3403
+msgid "light_water"
+msgstr ""
+
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="pharmacy"/>
+#. color health
+#. <icon annotate="true" src="health/pharmacy.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="hospital"/>
+#. color health
+#. <icon annotate="true" src="health/hospital.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="nursery"/>
+#. color health
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="baby_hatch"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color health
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="doctors"/>
+#. color health
+#. <icon annotate="true" src="health/doctor.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="dentist"/>
+#. color health
+#. <icon annotate="true" src="health/dentist.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="amenity" v="veterinary"/>
+#: build/trans_style.java:2342 build/trans_style.java:2350
+#: build/trans_style.java:2358 build/trans_style.java:2367
+#: build/trans_style.java:2374 build/trans_style.java:2382
+#: build/trans_style.java:2390
+msgid "health"
+msgstr ""
+
+#. color amenity_light
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--shop tags -->
+#.
+#. <rule>
+#. <condition k="shop" v="supermarket"/>
+#. <icon annotate="true" src="shop/supermarket.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="convenience"/>
+#. <icon annotate="true" src="shop/supermarket.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="bakery"/>
+#. <icon annotate="true" src="shop/groceries/bakery.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="butcher"/>
+#. <icon annotate="true" src="shop/groceries/butcher.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="bicycle"/>
+#. <icon annotate="true" src="sport/bicycle.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="doityourself"/>
+#. <icon annotate="true" src="shop/diy_store.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="dry_cleaning"/>
+#. <icon annotate="true" src="shop/laundry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="laundry"/>
+#. <icon annotate="true" src="shop/laundry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="outdoor"/>
+#. <icon annotate="true" src="shop/sports/outdoor.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="kiosk"/>
+#. <icon annotate="true" src="shop/kiosk.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="alcohol"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="beverages"/>
+#. <icon annotate="true" src="shop/beverages.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="books"/>
+#. <icon annotate="true" src="shop/rental/library.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car_dealer"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="car_repair"/>
+#. <icon annotate="true" src="transport/car.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="chemist"/>
+#. <icon annotate="true" src="shop/chemist.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="clothes"/>
+#. <icon annotate="true" src="shop/clothes.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="computer"/>
+#. <icon annotate="true" src="shop/computer.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="cycle_repair"/>
+#. <icon annotate="true" src="sport/bicycle.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="department_store"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="electronics"/>
+#. <icon annotate="true" src="shop/electronics.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="furniture"/>
+#. <icon annotate="true" src="shop/furniture.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="florist"/>
+#. <icon annotate="true" src="shop/florist.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="groceries"/>
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="garden_centre"/>
+#. <icon annotate="true" src="shop/garden_centre.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hairdresser"/>
+#. <icon annotate="true" src="shop/hairdresser.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hardware"/>
+#. <icon annotate="true" src="shop/diy_store.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="hifi"/>
+#. <icon annotate="true" src="shop/hifi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="jewelry"/>
+#. <icon annotate="true" src="shop/jewelry.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="mall"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="motorcycle"/>
+#. <icon annotate="true" src="vehicle/motorbike.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="newsagent"/>
+#. <icon annotate="true" src="shop/kiosk.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="organic"/>
+#. <icon annotate="true" src="shop/groceries/fruits.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="optician"/>
+#. <icon annotate="true" src="shop/optician.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="shoes"/>
+#. <icon annotate="true" src="shop/shoes.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="sports"/>
+#. <icon annotate="true" src="sport/multi.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="stationery"/>
+#. <icon annotate="true" src="misc/no_icon.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="tailor"/>
+#. <icon annotate="true" src="shop/tailor.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="travel_agency"/>
+#. <icon annotate="true" src="place/island.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="toys"/>
+#. <icon annotate="true" src="shop/toys.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="shop" v="video"/>
+#. <icon annotate="true" src="shop/video.png"/>
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- duplicate of shopping_centre? -->
+#. <rule>
+#. <condition k="shop" v="shopping_centre"/>
+#. <icon annotate="true" src="shop/mall.png"/>
+#: build/trans_style.java:2568 build/trans_style.java:2576
+#: build/trans_style.java:2584 build/trans_style.java:2592
+#: build/trans_style.java:2600 build/trans_style.java:2608
+#: build/trans_style.java:2616 build/trans_style.java:2624
+#: build/trans_style.java:2632 build/trans_style.java:2640
+#: build/trans_style.java:2648 build/trans_style.java:2656
+#: build/trans_style.java:2664 build/trans_style.java:2672
+#: build/trans_style.java:2680 build/trans_style.java:2688
+#: build/trans_style.java:2696 build/trans_style.java:2704
+#: build/trans_style.java:2712 build/trans_style.java:2720
+#: build/trans_style.java:2728 build/trans_style.java:2736
+#: build/trans_style.java:2744 build/trans_style.java:2752
+#: build/trans_style.java:2760 build/trans_style.java:2768
+#: build/trans_style.java:2776 build/trans_style.java:2784
+#: build/trans_style.java:2792 build/trans_style.java:2800
+#: build/trans_style.java:2808 build/trans_style.java:2816
+#: build/trans_style.java:2824 build/trans_style.java:2832
+#: build/trans_style.java:2840 build/trans_style.java:2848
+#: build/trans_style.java:2856 build/trans_style.java:2864
+#: build/trans_style.java:2872 build/trans_style.java:2880
+#: build/trans_style.java:2888 build/trans_style.java:2896
+#: build/trans_style.java:2905
+msgid "shop"
+msgstr "магазин"
+
+#. color shop
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--tourism tags -->
+#.
+#. <rule>
+#. <condition k="tourism" v="hotel"/>
+#. <icon annotate="true" src="accommodation.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="motel"/>
+#. <icon annotate="true" src="accommodation/motel.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="guest_house"/>
+#. <icon annotate="true" src="accommodation/guest_house.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="hostel"/>
+#. <icon annotate="true" src="accommodation/hostel.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="chalet"/>
+#. <icon annotate="true" src="accommodation/chalet.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="alpine_hut"/>
+#. <icon annotate="true" src="accommodation/alpine_hut.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="camp_site"/>
+#. <icon annotate="true" src="accommodation/camping.png"/>
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="caravan_site"/>
+#. <icon annotate="true" src="accommodation/camping/caravan.png"/>
+#: build/trans_style.java:2915 build/trans_style.java:2923
+#: build/trans_style.java:2931 build/trans_style.java:2939
+#: build/trans_style.java:2947 build/trans_style.java:2955
+#: build/trans_style.java:2963 build/trans_style.java:2971
+msgid "hotel"
+msgstr ""
+
+#. color hotel
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="picnic_site"/>
+#. <icon annotate="true" src="leisure/picnic.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="viewpoint"/>
+#. <icon annotate="true" src="sightseeing/viewpoint.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="theme_park"/>
+#. <icon annotate="true" src="leisure/theme_park.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="attraction"/>
+#. <icon annotate="true" src="sightseeing.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="zoo"/>
+#. <icon annotate="true" src="leisure/zoo.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="artwork"/>
+#. <icon annotate="true" src="service/arts_centre.png"/>
+#. color tourism
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="museum"/>
+#. <icon annotate="true" src="sightseeing/museum.png"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- information tags -->
+#. <rule>
+#. <condition k="information" v="guidepost"/>
+#. <icon annotate="true" src="misc/information/guidepost.png" priority="10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="office"/>
+#. <icon annotate="true" src="misc/information/informationoffice.png" priority="10"/>
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="map"/>
+#. <icon annotate="true" src="misc/information/map.png" priority="10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="information" v="board"/>
+#. <icon annotate="true" src="misc/information/board.png" priority="10"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="tourism" v="information"/>
+#. <icon annotate="true" src="misc/information.png"/>
+#: build/trans_style.java:2979 build/trans_style.java:2987
+#: build/trans_style.java:2995 build/trans_style.java:3003
+#: build/trans_style.java:3011 build/trans_style.java:3019
+#: build/trans_style.java:3020 build/trans_style.java:3028
+#: build/trans_style.java:3044 build/trans_style.java:3066
+msgid "tourism"
+msgstr ""
+
+#. color tourism
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--historic tags -->
+#.
+#. <rule>
+#. <condition k="historic" v="castle"/>
+#. <icon annotate="true" src="sightseeing/castle.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="monument"/>
+#. <icon annotate="true" src="sightseeing/monument.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="memorial"/>
+#. <icon annotate="true" src="sightseeing/memorial.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="archaeological_site"/>
+#. <icon annotate="true" src="sightseeing/archaeological.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="ruins"/>
+#. <icon annotate="true" src="sightseeing/ruins.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="battlefield"/>
+#. <icon annotate="true" src="sightseeing/battlefield.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="geological" v="palaeontological_site"/>
+#. <icon annotate="true" src="historic/palaeontological_site.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="wayside_cross"/>
+#. <icon annotate="true" src="religion/wayside_cross.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="wayside_shrine"/>
+#. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
+#: build/trans_style.java:3076 build/trans_style.java:3084
+#: build/trans_style.java:3092 build/trans_style.java:3100
+#: build/trans_style.java:3108 build/trans_style.java:3116
+#: build/trans_style.java:3124 build/trans_style.java:3132
+#: build/trans_style.java:3140 build/trans_style.java:3148
+msgid "historic"
+msgstr ""
+
+#. color green
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="quarry"/>
+#: build/trans_style.java:3196
+msgid "quarry"
+msgstr ""
+
+#. color quarry
+#. <icon src="misc/landmark/mine.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="landfill"/>
+#: build/trans_style.java:3204
+msgid "landfill"
+msgstr ""
+
+#. color landfill
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="basin"/>
+#. color basin
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="reservoir"/>
+#: build/trans_style.java:3212 build/trans_style.java:3220
+msgid "basin"
+msgstr ""
+
+#. color basin
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="forest"/>
+#: build/trans_style.java:3228
+msgid "forest"
+msgstr ""
+
+#. color residential
+#. <icon src="misc/landuse/residential.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="farmyard"/>
+#: build/trans_style.java:3260
+msgid "farmyard"
+msgstr ""
+
+#. color farmyard
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#.
+#. <rule>
+#. <condition k="landuse" v="retail"/>
+#. color retail
+#. <icon src="shop/mall.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="commercial"/>
+#: build/trans_style.java:3269 build/trans_style.java:3277
+msgid "retail"
+msgstr ""
+
+#. color retail
+#. <icon src="misc/landuse/commercial.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="industrial"/>
+#: build/trans_style.java:3285
+msgid "industrial"
+msgstr ""
+
+#. color industrial
+#. <icon src="misc/landmark/works.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="brownfield"/>
+#: build/trans_style.java:3293
+msgid "brownfield"
+msgstr ""
+
+#. color brownfield
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="greenfield"/>
+#: build/trans_style.java:3301
+msgid "greenfield"
+msgstr ""
+
+#. color greenfield
+#. <icon src="misc/no_icon.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="railway"/>
+#: build/trans_style.java:3309
+msgid "railland"
+msgstr ""
+
+#. color construction
+#. <icon src="misc/construction.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="military"/>
+#. color green
+#. <icon src="leisure/common.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--military tags -->
+#.
+#. <rule>
+#. <condition k="military" v="airfield"/>
+#. <icon src="transport/airport/airfield.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="bunker"/>
+#. <icon src="misc/landmark/bunker.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="barracks"/>
+#. <icon src="misc/no_icon.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="danger_area"/>
+#. <icon src="misc/danger.png"/>
+#. color military
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="military" v="range"/>
+#. <icon src="misc/landmark/range.png"/>
+#: build/trans_style.java:3326 build/trans_style.java:3361
+#: build/trans_style.java:3369 build/trans_style.java:3377
+#: build/trans_style.java:3385 build/trans_style.java:3393
+msgid "military"
+msgstr ""
+
+#. color military
+#. <icon src="vehicle/tank.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="landuse" v="cemetery"/>
+#: build/trans_style.java:3334
+msgid "cemetery"
+msgstr ""
+
+#. color light_water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="peak"/>
+#: build/trans_style.java:3410
+msgid "peak"
+msgstr ""
+
+#. color peak
+#. <icon annotate="true" src="misc/landmark/peak_small.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="glacier"/>
+#. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
+#: build/trans_style.java:3419
+msgid "glacier"
+msgstr ""
+
+#. color glacier
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="volcano"/>
+#. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
+#: build/trans_style.java:3427
+msgid "volcano"
+msgstr "вулкан"
+
+#. color volcano
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="cliff"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="scree"/>
+#. <icon src="misc/no_icon.png"/>
+#. color scrub
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="fell"/>
+#. <icon src="misc/no_icon.png"/>
+#. color beach
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="bay"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="land"/>
+#. <icon src="misc/no_icon.png"/>
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="cave_entrance"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3435 build/trans_style.java:3436
+#: build/trans_style.java:3444 build/trans_style.java:3460
+#: build/trans_style.java:3524 build/trans_style.java:3532
+#: build/trans_style.java:3540
+msgid "natural"
+msgstr ""
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="scrub"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3452
+msgid "scrub"
+msgstr ""
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="heath"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3468
+msgid "heath"
+msgstr ""
+
+#. color heath
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="wood"/>
+#. <icon src="misc/landmark/trees.png"/>
+#: build/trans_style.java:3476
+msgid "woodarea"
+msgstr ""
+
+#. color water
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="mud"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3508
+msgid "mud"
+msgstr ""
+
+#. color mud
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="beach"/>
+#. <icon src="misc/no_icon.png"/>
+#: build/trans_style.java:3516
+msgid "beach"
+msgstr "пляж"
+
+#. color natural
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="natural" v="tree"/>
+#. <icon src="misc/landmark/trees.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--route tags -->
+#.
+#. <rule>
+#. <condition k="route" v="bus"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ferry"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="flight"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ncn"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="subsea"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="ski"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="tour"/>
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="route" v="pub_crawl"/>
+#: build/trans_style.java:3556 build/trans_style.java:3564
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+msgid "route"
+msgstr "маршрут"
+
+#. color route
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!--boundary tags -->
+#.
+#. <rule>
+#. <condition k="boundary" v="national"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="admin_level" v="1"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="2"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="3"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="4"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="5"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="6"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="7"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="8"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="9"/>
+#. color boundary
+#. </rule>
+#. <rule>
+#. <condition k="admin_level" v="10"/>
+#. color boundary
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="administrative"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="civil"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="political"/>
+#. color boundary
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="boundary" v="national_park"/>
+#: build/trans_style.java:3622 build/trans_style.java:3630
+#: build/trans_style.java:3634 build/trans_style.java:3638
+#: build/trans_style.java:3642 build/trans_style.java:3646
+#: build/trans_style.java:3650 build/trans_style.java:3654
+#: build/trans_style.java:3658 build/trans_style.java:3662
+#: build/trans_style.java:3666 build/trans_style.java:3671
+#: build/trans_style.java:3679 build/trans_style.java:3687
+#: build/trans_style.java:3695
+msgid "boundary"
+msgstr ""
+
+#. color deprecated
+#. <icon src="misc/landmark/mountain_pass.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- this will badly display otherwise well tagged footways and alike, so comment it out until we have better ways to display this in JOSM!
+#. XXX - maybe it's possible to use linemod's here?
+#. <rule>
+#. <condition k="surface" v="paved"/>
+#. <linemod mode="under" width="0" dashedcolour="#505050"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="surface" v="unpaved"/>
+#. <linemod mode="under" width="0" dashedcolour="#301000"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. <rule>
+#. <condition k="surface" v="gravel"/>
+#. <linemod mode="under" width="0" dashedcolour="#100070"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="surface" v="cobblestone"/>
+#. <linemod mode="under" width="0" dashedcolour="#600060"/>
+#. <icon annotate="true" src="misc/deprecated.png"/>
+#. <scale_min>1</scale_min>
+#. <scale_max>40000</scale_max>
+#. </rule>
+#. -->
+#.
+#. <!--name tags -->
+#.
+#. <!--preferences tags -->
+#.
+#. <!--place tags -->
+#.
+#. <rule>
+#. <condition k="place" v="continent"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="country"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="state"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="region"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="county"/>
+#. <icon annotate="true" src="place/settlement/capital.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="city"/>
+#. <icon annotate="true" src="place/settlement/city.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>200000000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="town"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="village"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="hamlet"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="suburb"/>
+#. <icon annotate="true" src="place/settlement/town.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="locality"/>
+#. <icon annotate="true" src="place/locality.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="island"/>
+#. <icon annotate="true" src="place/island.png"/>
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="place" v="islet"/>
+#. <icon annotate="true" src="place/islet.png"/>
+#: build/trans_style.java:4135 build/trans_style.java:4143
+#: build/trans_style.java:4151 build/trans_style.java:4159
+#: build/trans_style.java:4167 build/trans_style.java:4175
+#: build/trans_style.java:4183 build/trans_style.java:4191
+#: build/trans_style.java:4199 build/trans_style.java:4207
+#: build/trans_style.java:4215 build/trans_style.java:4223
+#: build/trans_style.java:4231
+msgid "place"
+msgstr ""
+
+#. color place
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- special display of unreviewed tiger data (USA) -->
+#. <rule>
+#. <condition k="tiger:reviewed" v="no"/>
+#: build/trans_style.java:4239
+msgid "tiger_data"
+msgstr ""
+
+#. <?xml version="1.0"?>
+#. <surveyor columns="4" width="1300" height="0">
+#. <!-- icons can either be absolute paths or relative paths to the .josm directory -->
+#. <!-- action class: either fully qualified classnames or if not found,
+#. package at.dallermassl.josm.plugin.surveyor.action is assumed -->
+#: build/trans_surveyor.java:6
+msgid "Tunnel Start"
+msgstr ""
+
+#. <button label="Bridge" hotkey="B" type="toggle">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="bridge"/>
+#. </button>
+#: build/trans_surveyor.java:16
+msgid "Village/City"
+msgstr ""
+
+#. <button label="Parking" hotkey="P" icon="styles/standard/vehicle/parking.png">
+#. <!--action class="SetNodeAction" params="amenity=parking"/-->
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Parking"/>
+#. </button>
+#: build/trans_surveyor.java:29
+msgid "One Way"
+msgstr ""
+
+#. <button label="One Way" hotkey="O" icon="presets/oneway.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="oneway=yes"/>
+#. </button>
+#: build/trans_surveyor.java:33
+msgid "Church"
+msgstr ""
+
+#. <button label="Church" hotkey="C" icon="styles/standard/religion/church.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetNodeAction" params="amenity=place_of_worship,denomination=christian"/>
+#. <action class="SetWaypointAction" params="Church"/>
+#. </button>
+#: build/trans_surveyor.java:38
+msgid "Fuel Station"
+msgstr ""
+
+#. <button label="Restaurant" hotkey="R" icon="styles/standard/food/restaurant.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetNodeAction" params="amenity=restaurant"/>
+#. <action class="SetWaypointAction" params="Restaurant"/>
+#. </button>
+#: build/trans_surveyor.java:52
+msgid "Shopping"
+msgstr ""
+
+#. <button label="Shopping" hotkey="S" icon="styles/standard/shop.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: build/trans_surveyor.java:56
+msgid "WC"
+msgstr "Туалет"
+
+#. <button label="WC" hotkey="W" icon="styles/standard/vehicle/parking/restarea_toilets.png">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Info"/>
+#. </button>
+#: build/trans_surveyor.java:60
+msgid "Camping"
+msgstr ""
+
+#. <button label="Residential" hotkey="5">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Residential"/>
+#. </button>
+#. <!--
+#. <button label="Test" hotkey="shift X">
+#. <action class="PlayAudioAction" params="resource://audio/KDE_Window_Iconify.wav"/>
+#. <action class="SetWaypointAction" params="Test X"/>
+#. </button>
+#: build/trans_surveyor.java:93 build/trans_surveyor.java:97
+msgid "Test"
+msgstr "Перевірка"
+
+#. JOSM TagChecker validator file
+#. Format:
+#. Each line specifies a certain error to be reported
+#. <data type> : messagetype : <key><expression><value>
+#.
+#. Data type can be:
+#. node        - a node point
+#. way         - a way
+#. relation    - a relation
+#. *           - all data types
+#.
+#. Message type can be:
+#. E            - an error
+#. W            - a warning
+#. I            - an low priority informational warning
+#.
+#. Key and value are expressions describing certain keys and values of these keys.
+#. Regulator expressions are supported. In this case the expressions starts and
+#. ends with // signs. If an 'i' is appended, the regular expression is
+#. case insensitive.
+#.
+#. The * sign indicates any string.
+#. The texts BOOLEAN_TRUE and BOOLEAN_FALSE in the value part indicate a special
+#. handling for boolean values (yes, true, 0, false, no, ...).
+#.
+#. Expression can be:
+#. !=          - the key/value combination does not match
+#. ==          - the key/value combination does match
+#.
+#. To have more complicated expressions, multiple elements can be grouped together
+#. with an logical and (&&).
+#.
+#. The comment at the end of a rule is displayed in validator description
+#.
+#. Empty lines and space signs are ignored
+#: build/trans_validator.java:38
+msgid "abbreviated street name"
+msgstr ""
+
+#. way  : W : highway == * && name == /.* (Ave|Blvd|Cct|Cir|Cl|Cr|Crct|Cres|Crt|Ct|Dr|Drv|Esp|Espl|Hwy|Ln|Mw|Mwy|Pl|Rd|Qy|Qys|Sq|St|Str|Ter|Tce|Tr|Wy)\.?$/i
+#: build/trans_validator.java:40
+msgid "oneway tag on a node"
+msgstr ""
+
+#. node : W : oneway == *
+#: build/trans_validator.java:41
+msgid "bridge tag on a node"
+msgstr ""
+
+#. node : W : bridge == BOOLEAN_TRUE
+#. node : W : highway == tertiary
+#. node : W : highway == secondary
+#. node : W : highway == residential
+#. node : W : highway == unclassified
+#: build/trans_validator.java:42 build/trans_validator.java:43
+#: build/trans_validator.java:44 build/trans_validator.java:45
+#: build/trans_validator.java:46
+msgid "wrong highway tag on a node"
+msgstr ""
+
+#. node : W : highway == track
+#: build/trans_validator.java:47
+msgid "Unnamed unclassified highway"
+msgstr ""
+
+#. way  : W : highway == unclassified && name != *
+#. way  : I : highway == secondary && ref != *
+#. way  : I : highway == tertiary && ref != *
+#: build/trans_validator.java:48 build/trans_validator.java:49
+#: build/trans_validator.java:50
+msgid "highway without a reference"
+msgstr ""
+
+#. way  : I : highway == motorway && nat_ref != *
+#: build/trans_validator.java:51
+msgid "temporary highway type"
+msgstr ""
+
+#. *    : W : highway == road
+#: build/trans_validator.java:52
+msgid "misspelled key name"
+msgstr ""
+
+#. *    : W : / *name */i == * && name != *
+#. The following could replace unnamed way check. Still at the moment we keep it as it is
+#. way  : W : junction == roundabout && highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed junction
+#. way  : W : highway == /motorway|trunk|primary|secondary|tertiary|residential|pedestrian/ && /name|ref|(name:.*)|(.*_name)|(.*_ref)/ != * # Unnamed
+#: build/trans_validator.java:58
+msgid "cycleway with tag bicycle"
+msgstr ""
+
+#. way  : W : highway == cycleway && bicycle == BOOLEAN_FALSE
+#: build/trans_validator.java:59
+msgid "footway with tag foot"
+msgstr ""
+
+#. way  : W : highway == footway && foot == BOOLEAN_FALSE
+#. way  : I : highway == cycleway && bicycle == *                 # cycleway with tag bicycle
+#. way  : I : highway == footway && foot == *                     # footway with tag foot
+#: build/trans_validator.java:62
+msgid "separate cycleway as lane on a cycleway"
+msgstr ""
+
+#. way  : W : highway == cycleway && cycleway == lane
+#: build/trans_validator.java:63
+msgid "barrier used on a way"
+msgstr ""
+
+#. way  : W : highway == * && barrier == *
+#. way  : I : waterway == * && layer != *                         # waterway without layer tag
+#. way  : I : highway == footway && maxspeed == *
+#: build/trans_validator.java:66 build/trans_validator.java:67
+msgid "maxspeed used for footway"
+msgstr ""
+
+#. way  : I : highway == steps && maxspeed == *
+#: build/trans_validator.java:69
+msgid "layer tag with + sign"
+msgstr ""
+
+#. *    : W : layer == /\+.*/
+#: build/trans_validator.java:71
+msgid "street name contains ss"
+msgstr ""
+
+#. *    : I : name == /.*Strasse.*/i
+#: build/trans_validator.java:73
+msgid "relation without type"
+msgstr ""
+
+#. relation : E : type != *
+#: build/trans_validator.java:75
+msgid "restaurant without name"
+msgstr ""
+
+#. node : I : amenity == /restaurant|cafe|fast_food/ && name != *
+#. way  : I : highway != * && railway != * && waterway != * && name == * # unusual named way type
+#. *    : W : natural == water && waterway == *                   # unusual tag combination
+#. *    : W : highway == * && waterway == *
+#: build/trans_validator.java:78 build/trans_validator.java:79
+msgid "unusual tag combination"
+msgstr ""
+
+#. FORMAT
+#. default(true or false);Name;URL
+#. NOTE: default items should be common and worldwide
+#.
+#: build/trans_wms.java:5
+msgid "Landsat"
+msgstr ""
+
+#. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
+#: build/trans_wms.java:6
+msgid "Open Aerial Map"
+msgstr ""
+
+#. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
+#.
+#. different forms for web access
+#. must be html:<url>
+#: build/trans_wms.java:10
+msgid "Yahoo Sat"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
+#: build/trans_wms.java:11
+msgid "OpenStreetMap"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
+#: build/trans_wms.java:12
+msgid "OpenCycleMap"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
+#: build/trans_wms.java:13
+msgid "TilesAtHome"
+msgstr ""
+
+#. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
+#.
+#.
+#. only for Germany
+#: build/trans_wms.java:17
+msgid "Streets NRW Geofabrik.de"
+msgstr ""
+
+#. http://tools.geofabrik.de/osmi/view/strassennrw/josmwms?
+#.
+#.
+#. only for North America
+#. Terraserver USCG - High resolution maps
+#: build/trans_wms.java:22
+msgid "Terraserver Topo"
+msgstr ""
+
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
+#: build/trans_wms.java:23
+msgid "Terraserver Urban"
+msgstr ""
+
+#. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
+#.
+#.
+#. only for Czech Republic
+#: build/trans_wms.java:27
+msgid "Czech CUZK:KM"
+msgstr ""
+
+#. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:28
+msgid "Czech UHUL:ORTOFOTO"
+msgstr ""
+
+#. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
+#.
+#.
+#. only for GB
+#. fails with division by zero error
+#: build/trans_wms.java:33
+msgid "NPE Maps"
+msgstr ""
+
+#. http://nick.dev.openstreetmap.org/openpaths/freemap.php?layers=npe&
+#: build/trans_wms.java:34
+msgid "NPE Maps (Tim)"
+msgstr ""
+
+#. http://dev.openstreetmap.org/~timsc/wms2/map.php?
+#: build/trans_wms.java:35
+msgid "7th Series (OS7)"
+msgstr ""
+
+#. http://ooc.openstreetmap.org/wms/map.php?source=os7&
+#.
+#.
+#. only for Japan
+#: build/trans_wms.java:39
+msgid "MLIT Japan (ORTHO)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:40
+msgid "MLIT Japan (ORTHO01)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:41
+msgid "MLIT Japan (ORTHO02)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#: build/trans_wms.java:42
+msgid "MLIT Japan (ORTHO03)"
+msgstr ""
+
+#. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
+#.
+#.
+#. only for Italy
+#: build/trans_wms.java:46
+msgid "Lodi - Italy"
+msgstr ""
+
+#. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
+#: build/trans_wms.java:47
+msgid "Sicily - Italy"
+msgstr ""
+
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "Надсилання об’єктів. Кількість —  {0}…"
+
+#~ msgid "GPS point"
+#~ msgstr "точка GPS"
+
+#~ msgid "reverter: {0}"
+#~ msgstr "відновлювач: {0}"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 21299)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 21304)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 10:11+0200\n"
-"PO-Revision-Date: 2010-05-09 14:50+0000\n"
+"POT-Creation-Date: 2010-05-16 13:43+0200\n"
+"PO-Revision-Date: 2010-05-10 09:27+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,10 +16,10 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-05-10 07:55+0000\n"
+"X-Launchpad-Export-Date: 2010-05-16 10:30+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
 
 #. FIXME why is help not a JosmAction?
-#: ../core/src/org/openstreetmap/josm/Main.java:210
+#: ../core/src/org/openstreetmap/josm/Main.java:212
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:25
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:482
@@ -32,12 +32,12 @@
 msgstr "說明"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:411
+#: ../core/src/org/openstreetmap/josm/Main.java:437
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
 msgstr "忽略格式不良的檔案 URL： \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/Main.java:412
-#: ../core/src/org/openstreetmap/josm/Main.java:445
-#: ../core/src/org/openstreetmap/josm/Main.java:513
+#: ../core/src/org/openstreetmap/josm/Main.java:438
+#: ../core/src/org/openstreetmap/josm/Main.java:471
+#: ../core/src/org/openstreetmap/josm/Main.java:539
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:133
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:100
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:117
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:355
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
@@ -76,5 +76,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:424
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:724
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:238
@@ -97,9 +97,9 @@
 msgstr "警告"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:444
+#: ../core/src/org/openstreetmap/josm/Main.java:470
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr "參數「downloadgps」不能使用檔案名稱或檔案 URL"
 
-#: ../core/src/org/openstreetmap/josm/Main.java:512
+#: ../core/src/org/openstreetmap/josm/Main.java:538
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
@@ -119,8 +119,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:69
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:103
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:71
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:192
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:814
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:816
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:215
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:796
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:798
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:62
 msgid "Java OpenStreetMap Editor"
@@ -226,5 +226,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:97
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:89
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1198
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -264,5 +264,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:198
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -276,4 +276,5 @@
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:110
 #: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java:259
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:287
 #: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:94
@@ -329,4 +330,13 @@
 msgstr "由經緯度新增節點"
 
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
@@ -340,8 +350,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:16
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:71
 #, java-format
@@ -397,5 +407,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1164
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:376
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:384
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:689
@@ -451,5 +461,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:84
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:54
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:37
@@ -460,7 +470,8 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:40
 #: ../plugins/multipoly/src/multipoly/MultipolyAction.java:50
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 #: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 #: ../plugins/terracer/src/terracer/TerracerAction.java:66
@@ -478,7 +489,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AlignInLineAction.java:67
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:192
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:196
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:234
 #: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
@@ -546,28 +557,28 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "Nothing selected to zoom to."
 msgstr "沒有選擇要縮放的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #, java-format
 msgid "Zoom to {0}"
 msgstr "縮放至 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:105
 #, java-format
 msgid "Zoom the view to {0}."
 msgstr "將檢視縮放至 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:106
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:17
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
 #, java-format
 msgid "View: {0}"
 msgstr "檢視：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:191
+#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:195
 msgid "No conflicts to zoom to"
 msgstr "沒有要縮放的衝突"
@@ -656,5 +667,5 @@
 msgstr "組合 {0} 條路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:244
+#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:233
 msgid "Please select at least two ways to combine."
 msgstr "請選擇至少兩個以上的路徑來合併"
@@ -702,5 +713,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:102
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:944
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:942
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:985
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
@@ -811,5 +822,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78
-#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43
+#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:44
 msgid "Download object"
 msgstr "下載物件"
@@ -854,5 +865,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:144
 #, java-format
 msgid "Layer: {0}"
@@ -980,25 +991,25 @@
 msgstr "找不到交叉點。沒有東西變更。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:198
 msgid "Added node on all intersections"
 msgstr "在所有的交叉點加入節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:220
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
 msgid "Delete Ways that are not part of an inner multipolygon"
 msgstr "刪除不屬於內部多邊形一部分的路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
 msgid "Fix relations"
 msgstr "修正關係"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
 msgid "Joined self-overlapping area"
 msgstr "已連結自我重疊的區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:236
 msgid "Joined overlapping areas"
 msgstr "已連結重疊的區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:240
 msgid ""
 "Some of the ways were part of relations that have been modified. Please "
@@ -1006,33 +1017,33 @@
 msgstr "部分屬於關係的一部分的路徑被修改了。請檢查是否造成錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:303
 msgid "Enter values for all conflicts."
 msgstr "輸入所有衝突項目的數值。"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:298
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:304
 msgid "Solve Conflicts"
 msgstr "解決衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:313
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:319
 msgid "Fix tag conflicts"
 msgstr "修正標籤的衝突"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:482
 msgid "Removed Element from Relations"
 msgstr "從關係中移除元件"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:606
 msgid "Join Areas: Remove Short Ways"
 msgstr "連結區域：移除短路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:622
 msgid "Closed Way"
 msgstr "封閉的路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:919
 msgid "Remove tags from inner ways"
 msgstr "移除內部路徑的標籤"
 
-#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:934
+#: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:951
 msgid "Join Areas Function"
 msgstr "連結區域功能"
@@ -1051,5 +1062,5 @@
 msgstr "連結節點與直線"
 
-#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
+#: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:45
 msgid "No Shortcut"
 msgstr "沒有捷徑鍵"
@@ -1490,8 +1501,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:179
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:736
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:678
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:663
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:671
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1501,5 +1512,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:115
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:284
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:461
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:679
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:692
@@ -1897,20 +1908,27 @@
 msgstr "復原最後的動作。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:27
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:17
 msgid "Unselect All"
 msgstr "取消全選"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:16
 msgid "Unselect all objects."
 msgstr "取消選擇所有的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:25
+#. this is not really GROUP_EDIT, but users really would complain if the yhad to reconfigure because we put
+#. the correct group in
+#. Add extra shortcut C-S-a
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:22
 msgid "Unselect All (Focus)"
 msgstr "取消全選（焦點）"
 
-#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:36
+#. Add extra shortcut ESCAPE
+#.
+#. * FIXME: this isn't optimal. In a better world the mapmode actions
+#. * would be able to capture keyboard events and react accordingly. But
+#. * for now this is a reasonable approximation.
+#.
+#: ../core/src/org/openstreetmap/josm/actions/UnselectAllAction.java:33
 msgid "Unselect All (Escape)"
 msgstr "取消全選（跳出）"
@@ -2029,16 +2047,12 @@
 msgstr "切換線框檢視"
 
-#. make numpad + behave like + (action is already registred)
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:20
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:19
+#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:21
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:22
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:23
-#: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:28
 msgid "Zoom In"
 msgstr "拉近"
 
-#. make numpad - behave like -
+#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:18
 #: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:19
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:20
-#: ../core/src/org/openstreetmap/josm/actions/ZoomOutAction.java:23
 msgid "Zoom Out"
 msgstr "拉起"
@@ -2250,9 +2264,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
@@ -2269,52 +2283,52 @@
 "Ctrl：刪除參考的物件。"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 #: ../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:98
 msgid "Draw"
 msgstr "繪製"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:91
 msgid "Draw nodes"
 msgstr "繪製節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:98
+#. Add extra shortcut N
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:96
 msgid "Mode: Draw Focus"
 msgstr "模式：繪製焦點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:354
 msgid "Cannot add a node outside of the world."
 msgstr "不能在這個世界以外的地方加入節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:529
 msgid "Add node"
 msgstr "加入節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:533
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
 msgid "Add node into way"
 msgstr "將節點加入路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:539
 msgid "Connect existing way to node"
 msgstr "將既存的路徑連接到節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:541
 msgid "Add a new node to an existing way"
 msgstr "在既存的路徑加入新的節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:545
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:543
 msgid "Add node into way and connect"
 msgstr "將節點加入路徑並連接"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:938
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:936
 msgid "Create new node."
 msgstr "建立新的節點。"
 
-#: ../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:941
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:965
 msgid "Select node under cursor."
 msgstr "選取游標下的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:945
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:943
 #, java-format
 msgid "Insert new node into way."
@@ -2322,14 +2336,14 @@
 msgstr[0] "插入新的節點到{0} 路徑中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:953
 msgid "Start new way from last node."
 msgstr "從最後的節點開始新的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:957
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:955
 msgid "Continue way from last node."
 msgstr "從最後的節點繼續路徑。"
 
-#: ../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:967
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:978
 msgid "Finish drawing."
 msgstr "結束繪製。"
@@ -2870,5 +2884,5 @@
 msgstr "加入關係 {0}"
 
-#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
+#: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:61
 #, java-format
 msgid "Added {0} object"
@@ -3731,5 +3745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:14
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:90
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:85
 msgid "selected"
 msgstr "已選取"
@@ -3760,5 +3774,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:22
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:175
 msgid "background"
 msgstr "背景"
@@ -3842,9 +3856,9 @@
 msgstr "PUWG 區"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:174
 msgid "PUWG 1992 (Poland)"
 msgstr "PUWG 1992 (波蘭)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
+#: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:209
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
@@ -3942,6 +3956,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:705
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:485
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:275
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:493
 #, java-format
 msgid "{0} node"
@@ -4057,38 +4071,38 @@
 msgstr "參數「{0}」應為非空的數值，卻收到「{1}」"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:40
 msgid "Upload Preferences"
 msgstr "上傳偏好設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:39
 msgid "Upload the current preferences to the server"
 msgstr "將目前的偏好設定上傳到伺服器"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "string"
 msgstr "字串"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
 msgid "Name of the user."
 msgstr "使用者的名稱。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:55
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
 msgid "OSM Password."
 msgstr "OSM 密碼。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:56
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 msgid "Resize the applet to the given geometry (format: WIDTHxHEIGHT)"
 msgstr "將小程式重設為指定的大小（格式：寬x高）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid "string;string;..."
 msgstr "字串;字串;..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
 msgid ""
 "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
@@ -4097,5 +4111,5 @@
 "下載每樣。可以是 x1,y1,x2,y2、含有 lat=y&lon=x&zoom=z 的 URL 或檔案名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
 msgid ""
 "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
@@ -4105,5 +4119,5 @@
 "案名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:61
 msgid ""
 "Add each to the initial selection. Can be a google-like search string or an "
@@ -4112,87 +4126,87 @@
 "加入每一樣到初始選擇區域。可以是 google 式搜尋字串或以 osm-xml 傳回的 URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "any"
 msgstr "任何"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:62
 msgid "If specified, reset the configuration instead of reading it."
 msgstr "如果指定，會重設組態而非讀取它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:88
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:165
 msgid "Username"
 msgstr "使用者名稱"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:89
+#: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:91
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:173
 msgid "Password"
 msgstr "密碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:72
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
 msgid "usage"
 msgstr "用法"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:74
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "options"
 msgstr "選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:75
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
 msgid "Show this help"
 msgstr "顯示此說明訊息"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:76
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Standard unix geometry argument"
 msgstr "標準 unix 幾何引數"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:77
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
 msgid "Download the bounding box"
 msgstr "下載此綁定方塊"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:78
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)"
 msgstr "於此 url 下載位置 (具有 lat=x&lon=y&zoom=z)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr "開啟檔案（任何可以使用 檔案/開啟 來開啟的檔案類型）"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Download the bounding box as raw gps"
 msgstr "下載綁定方塊做為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr "將 url (lat=x&lon=y&zoom=z) 的位置下載為原始 gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Select with the given search"
 msgstr "選取指定的搜尋"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:83
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid "Launch in maximized mode"
 msgstr "以最大化模式啓動"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:89
 msgid "Reset the preferences to default"
 msgstr "重設偏好設定為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:90
 msgid "Set the language"
 msgstr "設定語言"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
 msgid "options provided as Java system properties"
 msgstr "選項提供為 Java 系統屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "/PATH/TO/JOSM/FOLDER/         "
 msgstr "/PATH/TO/JOSM/FOLDER/         "
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:92
 msgid "Change the folder for all user settings"
 msgstr "改變所有使用者設定值的資料夾"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:93
 msgid ""
 "note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
@@ -4204,9 +4218,9 @@
 "      Java 選項以 MB 來指定分配到記憶體的最大容量"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:96
 msgid "examples"
 msgstr "範例"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:103
 msgid ""
 "Parameters --download, --downloadgps, and --selection are processed in this "
@@ -4214,37 +4228,37 @@
 msgstr "參數 --download、 --downloadgps  和 --selection 會以這個順序處理。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:104
 msgid "Make sure you load some data if you use --selection."
 msgstr "如果您使用 --selection 請確定已載入某些資料。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:167
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:190
 msgid "Initializing"
 msgstr "初始化"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:173
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:196
 msgid "Updating plugins..."
 msgstr "正在更新外掛程式..."
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:201
 msgid "Installing updated plugins"
 msgstr "正在安裝更新的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:205
 msgid "Loading early plugins"
 msgstr "載入較早的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:186
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:209
 msgid "Setting defaults"
 msgstr "設定預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:191
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:214
 msgid "Creating main GUI"
 msgstr "建立主視窗中"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:198
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:221
 msgid "Loading plugins"
 msgstr "正在載入外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:239
+#: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:262
 #, java-format
 msgid "Preference setting {0} has been removed since it is no longer used."
@@ -4257,5 +4271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:167
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:87
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:989
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:987
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:179
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
@@ -4379,10 +4393,10 @@
 msgstr "使用者："
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:406
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:423
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:388
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:405
 msgid "Layer not in list."
 msgstr "圖層不在清單中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:712
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:694
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -4802,5 +4816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:28
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:191
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:193
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:637
@@ -5036,5 +5050,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>To keep your local version, JOSM<br>has to reset the id of primitive "
@@ -5042,6 +5056,4 @@
 "you agree?</html>"
 msgstr ""
-"<html>要保留您本地端的版本，JOSM<br>必須將原型 {0} 的 id 重設為 0。<br>在下次"
-"上傳時伺服器會重新<br>指派新的 id 給它。<br>您是否同意？</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5289,6 +5301,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:701
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:490
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:276
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:498
 #, java-format
 msgid "{0} way"
@@ -5298,5 +5310,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:466
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:709
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:503
 #, java-format
 msgid "{0} relation"
@@ -5586,5 +5598,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:75
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:977
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:975
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:125
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:471
@@ -5659,5 +5671,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:100
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:74
 msgid "Reload"
 msgstr "重新載入"
@@ -5713,9 +5725,9 @@
 msgstr "重製這個圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:601
 msgid "Move the selected layer one row up."
 msgstr "將選取的圖層上移一列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:620
 msgid "Move the selected layer one row down."
 msgstr "將選取的圖層下移一列。"
@@ -6841,8 +6853,8 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:432
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:382
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
@@ -7476,55 +7488,55 @@
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:863
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:919
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
 msgid "Delete from relation"
 msgstr "自關係中刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:924
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:943
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:947
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:945
 msgid "Delete Properties"
 msgstr "删除屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:978
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:976
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:990
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:988
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1026
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1024
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1025
 msgid "Select relation in main selection."
 msgstr "選擇主要選擇區域的關係。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1029
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1027
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1030
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:1028
 msgid "Select relation in relation list."
 msgstr ""
@@ -8164,5 +8176,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:125
 msgid "Bounds"
 msgstr ""
@@ -8194,21 +8206,21 @@
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "空指標例外(Null pointer exception)，可能遺漏某些標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:286
 msgid "Search ..."
 msgstr "搜尋 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:288
 msgid "Click to start searching for places"
 msgstr "點選以開始搜尋位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:328
 msgid "Querying name server"
 msgstr "查詢名稱伺服器"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:361
 msgid "Querying name server ..."
 msgstr "查詢名稱伺服器..."
@@ -8230,5 +8242,5 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:440
 #: build/trans_presets.java:402 build/trans_presets.java:660
 #: build/trans_presets.java:669 build/trans_presets.java:1032
@@ -8242,5 +8254,5 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:547
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:121
@@ -8276,14 +8288,14 @@
 msgstr "拼貼數"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:135
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:133
 #, java-format
 msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
 msgstr "讀取 CSS 檔案 ''help-browser.css'' 失敗。例外為：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:183
 msgid "JOSM Help Browser"
 msgstr "JOSM 協助文件瀏覽器"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:233
 #, java-format
 msgid ""
@@ -8302,5 +8314,5 @@
 "英語版本</a>。</p></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
+#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:255
 #, java-format
 msgid ""
@@ -8600,5 +8612,5 @@
 #: ../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:385
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
 msgid "Conflicts detected"
 msgstr "選取的衝突"
@@ -9346,7 +9358,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:232
-#, java-format
-msgid "Uploading {0} objects ..."
-msgstr "正在上傳 {0} 個物件..."
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
+#, java-format
+msgid "Uploading {0} object..."
+msgid_plural "Uploading {0} objects..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9503,4 +9518,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../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 點"
@@ -9666,5 +9682,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:614
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
@@ -9727,18 +9743,18 @@
 msgstr "資料圖層 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:179
 msgid "outside downloaded area"
 msgstr "超出下載的區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:279
 #, java-format
 msgid "version {0}"
 msgstr "版本 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:309
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr "警告：混合 0.6 和 0.5 資料會成為 0.5 版"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:350
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9747,5 +9763,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:348
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:356
 #, java-format
 msgid ""
@@ -9759,5 +9775,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:357
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:365
 #, java-format
 msgid ""
@@ -9770,11 +9786,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:386
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:487
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:497
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
 #, java-format
 msgid "{0} deleted"
@@ -9782,32 +9798,32 @@
 msgstr[0] "{0} 已刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:500
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:508
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} 組成："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 msgid "unset"
 msgstr "取消設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "API version: {0}"
 msgstr "API 版本： {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:603
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:611
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "轉換為 GPX 圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:701
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:709
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:715
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:710
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:718
 msgid "Following problems found:"
 msgstr ""
@@ -9848,8 +9864,4 @@
 msgstr[0] "{0} 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-msgid "GPS point"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
@@ -10132,5 +10144,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:271
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Geotagged Images"
 msgstr "有 Geotag 的圖片"
@@ -10154,5 +10166,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:596
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:100
 msgid "Delete image file from disk"
 msgstr "從磁碟刪除圖片檔"
@@ -10184,55 +10196,55 @@
 msgstr "檔案 {0} 有錯誤"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:67
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:66
 msgid "Display geotagged images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:81
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:80
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:106
 msgid "Previous"
 msgstr "上一幅"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
 msgid "Show previous Image"
 msgstr "顯示前一張圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:85
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:97
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:95
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 #, java-format
 msgid "Geoimage: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:92
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:90
 msgid "Remove photo from layer"
 msgstr "從圖層移除相片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:104
 msgid "Delete File from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 #: ../plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java:127
 msgid "Next"
 msgstr "下一幅"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114
 msgid "Show next Image"
 msgstr "顯示下一張圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:120
 msgid "Center view"
 msgstr "置中檢視"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:123
 msgid "Zoom best fit and 1:1"
 msgstr "最適與 1:1 縮放"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:126
 msgid "Move dialog to the side pane"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:236
 #, java-format
 msgid ""
@@ -10243,5 +10255,5 @@
 "高度： {0} m"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:239
 #, java-format
 msgid ""
@@ -10306,7 +10318,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:463
-#, fuzzy
 msgid "Show Text/Icons"
-msgstr "顯示/隱藏文字/圖示"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:464
@@ -11114,35 +11125,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:70
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:72
 msgid "Color"
 msgstr "顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:135
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:137
 #, java-format
 msgid "Paint style {0}: {1}"
 msgstr "繪畫樣式 {0}：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154
 msgid "Choose"
 msgstr "選擇"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:159
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:161
 #, java-format
 msgid "Choose a color for {0}"
 msgstr "選擇 {0} 的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:169
 msgid "Set to default"
 msgstr "設為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:180
 msgid "Set all to default"
 msgstr "全部設為預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:229
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:231
 msgid "Colors used by different objects in JOSM."
 msgstr "在 JOSM 中用於不同物件的顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:244
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:246
 msgid "Colors"
 msgstr "顏色"
@@ -11585,17 +11596,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
 msgid "disabled"
 msgstr "已停用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:54
 msgid "no modifier"
 msgstr "沒有修飾鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:164
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
 msgid "<h1><a name=\"top\">Keyboard Shortcuts</a></h1>"
 msgstr "<h1><a name=\"top\">鍵盤捷徑鍵</a></h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:166
 msgid ""
 "<p>Please note that shortcut keys are assigned to the actions when JOSM is "
@@ -11603,5 +11614,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:168
 msgid ""
 "<p>Furthermore, the shortcuts are activated when the actions are assigned to "
@@ -11612,5 +11623,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:171
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11627,9 +11638,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
 msgid "<h1>Modifier Groups</h1>"
 msgstr "<h1>修飾鍵群組</h1>"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:179
 msgid ""
 "<p>The last page lists the modifier keys JOSM will automatically assign to "
@@ -11640,5 +11651,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
@@ -11647,66 +11658,66 @@
 
 #. scroll up
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:185
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:186
 msgid "Read First"
 msgstr "請先閱讀"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:206
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:207
 msgid "Use default"
 msgstr "使用預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:216
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:217
 msgid "Disable"
 msgstr "停用"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:224
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:225
 msgid "Key:"
 msgstr "按鍵："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:239
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
 msgstr "注意：只使用真實的鍵盤按鍵！"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
 msgid "Keyboard Shortcuts"
 msgstr "鍵盤捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:253
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:254
 msgid "Edit Shortcuts"
 msgstr "編輯捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:256
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:279
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:302
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:325
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:257
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:280
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:303
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:326
 msgid "Primary modifier:"
 msgstr "第一修飾鍵："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:262
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:285
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:308
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:331
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:263
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:286
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:309
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:332
 msgid "Secondary modifier:"
 msgstr "第二修飾鍵："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:268
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:291
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:314
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:337
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:269
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:292
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:315
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:338
 msgid "Tertiary modifier:"
 msgstr "第三修飾鍵："
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:276
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:277
 msgid "Menu Shortcuts"
 msgstr "選單捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:299
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:300
 msgid "Hotkey Shortcuts"
 msgstr "熱鍵捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:322
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:323
 msgid "Subwindow Shortcuts"
 msgstr "子視窗捷徑鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:359
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:360
 msgid "Modifier Groups"
 msgstr "修飾鍵群組"
@@ -11767,21 +11778,21 @@
 msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:78
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:116
 msgid "Display coordinates as"
 msgstr "顯示坐標為"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:119
 msgid "Projection method"
 msgstr "投影方法"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:84
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:122
 msgid "Projection code"
 msgstr "投影法代碼"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:93
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:131
 msgid "Map Projection"
 msgstr "地圖投影"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:142
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:178
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
@@ -11826,10 +11837,9 @@
 msgstr "手動改變鍵盤捷徑鍵。"
 
-#. private String[] columnNames = new String[]{tr("Action"), tr("Shortcut"), tr("Group"), tr("ID")};
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Action"
 msgstr "動作"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:43
 msgid "Shortcut"
 msgstr "捷徑鍵"
@@ -12304,24 +12314,23 @@
 msgstr "不明的類型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:669
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:662
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:71
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:51
 #, java-format
 msgid "Could not read tagging preset source: {0}"
 msgstr "無法讀取標籤預設組合來源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:677
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:670
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 時發生錯誤： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:712
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "類型 {0} 的元件已支援。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:775
 #: ../plugins/terracer/src/terracer/TerracerAction.java:149
 #, java-format
@@ -12330,17 +12339,17 @@
 msgstr[0] "改變 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:778
 msgid "Nothing selected!"
 msgstr "尚未選擇！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:780
 msgid "Selection unsuitable!"
 msgstr "選擇區域不合適！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:788
 msgid "Apply Preset"
 msgstr "套用預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:863
 msgid "Change Properties"
 msgstr "改變屬性"
@@ -12851,11 +12860,4 @@
 msgid "Preparing upload request..."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:425
-#, java-format
-msgid "Uploading {0} object..."
-msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14127,5 +14129,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:451
 #, java-format
 msgid ""
@@ -14138,5 +14140,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:453
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:456
 msgid ""
 "This action will have no shortcut.\n"
@@ -14146,5 +14148,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:455
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
 #, java-format
 msgid ""
@@ -14155,5 +14157,5 @@
 "\n"
 
-#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
+#: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:460
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
 msgstr "（提示：您可以在偏好設定中編輯捷徑鍵。）"
@@ -14523,15 +14525,15 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:139
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:128
 msgid "Cannot place building outside of the world."
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
+#: ../plugins/buildings_tools/src/buildings_tools/Building.java:150
 #: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:16
-#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:18
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:15
+#: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java:17
 #: ../plugins/buildings_tools/src/buildings_tools/BuildingSizeDialog.java:32
 msgid "Set buildings size"
@@ -14550,18 +14552,18 @@
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:80
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:75
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:77
 msgid "Draw buildings"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:311
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:303
 msgid "Point on angle of building to start drawing"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:312
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:304
 msgid "Point on opposite end of building"
 msgstr ""
 
-#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:313
+#: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:305
 msgid "Set width of building"
 msgstr ""
@@ -14731,7 +14733,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-#, fuzzy
 msgid "Select first WMS layer in list."
-msgstr "選擇目標圖層"
+msgstr ""
 
 #. item "Man Made/Pipeline" combo "Type"
@@ -15292,7 +15293,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:29
-#, fuzzy
 msgid "(optional)"
-msgstr "選用性的"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:54
@@ -15321,7 +15321,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:74
-#, fuzzy
 msgid "Departement"
-msgstr "測量"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:79
@@ -16775,32 +16774,34 @@
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
 #: ../plugins/reverter/src/reverter/ObjectsHistoryDialog.java:16
+msgid "Objects history"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/ChangesetIdQuery.java:30
 #, fuzzy
-msgid "Objects history"
-msgstr "物件歷史紀錄"
+msgid "Revert"
+msgstr "重新設定"
 
 #: ../plugins/reverter/src/reverter/ObjectsHistoryAction.java:16
+msgid "History reverter"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
+msgid "Preparing history data..."
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:25
+msgid "Revert changeset"
+msgstr ""
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:44
 #, fuzzy
-msgid "History reverter"
-msgstr "歷史記錄項目"
-
-#: ../plugins/reverter/src/reverter/OsmServerMultiObjectReader.java:49
-#, fuzzy
-msgid "Preparing history data..."
-msgstr "準備 OSM 資料..."
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:23
-#, fuzzy
-msgid "Revert changeset"
-msgstr "開放的變更組合"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:35
-#, fuzzy, java-format
-msgid "reverter: {0}"
-msgstr "要求的：{0}"
-
-#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:46
-#, fuzzy, java-format
+msgid "Reverting..."
+msgstr "關係..."
+
+#: ../plugins/reverter/src/reverter/RevertChangesetAction.java:51
+#, java-format
 msgid "Revert changeset #{0}"
-msgstr "變更組合 {0}"
+msgstr ""
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:28
@@ -17036,5 +17037,4 @@
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:142
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:54
 #, java-format
 msgid "Error parsing {0}: {1}"
@@ -17110,16 +17110,16 @@
 msgstr "未預期的欄號 {0}"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:85
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:22
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:59
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:26
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:29
 msgid "Tagging Preset Tester"
 msgstr "標籤預設組合測試程式"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:27
 msgid ""
 "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr "開啟標籤預設組合測試工具以預覽標籤預設組合對話盒。"
 
-#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:34
+#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:43
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr "您必須先在偏好設定中指定標籤預設組合來源。"
@@ -17965,57 +17965,49 @@
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object..."
-msgstr "正在刪除物件"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:72
-#, fuzzy
 msgid "Undelete object by id"
-msgstr "正在刪除物件"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:78
-#, fuzzy
 msgid "Select if the data should be added into a new layer"
-msgstr "如果資料要下載到新的圖層裡請選擇此項"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:96
-#, fuzzy
 msgid "Enter the ID of the object that should be undeleted"
-msgstr "輸入要下載的物件 ID"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:108
-#, fuzzy
 msgid "Undelete Object"
-msgstr "正在刪除物件"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:109
-#, fuzzy
 msgid "Undelete object"
-msgstr "正在刪除物件"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:114
-#, fuzzy
 msgid "Start undeleting"
-msgstr "開始下載"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:115
-#, fuzzy
 msgid "Close dialog and cancel"
-msgstr "關閉對話盒並取消下載"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "Will get {0}"
-msgstr "檔案: {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:174
-#, fuzzy, java-format
+#, java-format
 msgid "Looking for {0}"
-msgstr "正在載入 {0}"
+msgstr ""
 
 #: ../plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java:176
-#, fuzzy, java-format
+#, java-format
 msgid "Found {0}"
-msgstr "節點 {0}"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18763,4 +18755,14 @@
 msgstr "{0}, ..."
 
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/PositionLayer.java:85
+msgid "Shows current position in the video"
+msgstr ""
+
+#. Register for GPS menu
+#: ../plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoMappingPlugin.java:32
+#, fuzzy
+msgid " Video"
+msgstr "影片類"
+
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:23
 msgid "Scanned Map..."
@@ -19173,4 +19175,10 @@
 msgstr "您必須將自己的編輯設為公開才能上傳新的資料"
 
+#. use has not made edits public
+#: build/specialmessages.java:12
+#, fuzzy
+msgid "town"
+msgstr "下"
+
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
@@ -19367,7 +19375,6 @@
 #. Plugin reverter
 #: build/trans_plugins.java:63
-#, fuzzy
 msgid "Plugin for reverting changesets"
-msgstr "執行對話盒以查詢變更組合"
+msgstr ""
 
 #. Plugin routes
@@ -19444,6 +19451,14 @@
 "籤名稱的拼字檢查。"
 
+#. Plugin videomapping
+#: build/trans_plugins.java:87
+msgid ""
+"(This Plugin is currently work in progress!!!) Links and syncs a "
+"georeferenced video against a GPS track, to use it for identify visible "
+"objects."
+msgstr ""
+
 #. Plugin walkingpapers
-#: build/trans_plugins.java:87
+#: build/trans_plugins.java:89
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -19452,15 +19467,15 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:89
+#: build/trans_plugins.java:91
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin wayselector
-#: build/trans_plugins.java:91
+#: build/trans_plugins.java:93
 msgid "Select a sequence of non-branching connected ways"
 msgstr ""
 
 #. Plugin wms-turbo-challenge2
-#: build/trans_plugins.java:93
+#: build/trans_plugins.java:95
 msgid ""
 "Drive a race car from point A to point B over aerial imagery, leave cacti "
@@ -19469,5 +19484,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:95
+#: build/trans_plugins.java:97
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -31929,4 +31944,7 @@
 msgstr ""
 
+#~ msgid "Uploading {0} objects ..."
+#~ msgstr "正在上傳 {0} 個物件..."
+
 #~ msgid "Open in Browser"
 #~ msgstr "在瀏覽器中打開"
